diff options
| author | Ricardo Cervera-Navarro <rcervera@google.com> | 2014-04-18 19:19:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-18 19:19:57 +0000 |
| commit | 62ee3e9ab623a6ac1bb08a0b4db17e749315ac57 (patch) | |
| tree | 139eb3eae1ab5d597ee770a4a64863c961dfad99 /data/videos/VideoPackage1.mk | |
| parent | 40d75a6480f75c3475e78569c9bc1b6c51f6ed51 (diff) | |
| parent | 15d1feb0c183b09877317ea64be4e477bfb7fd3d (diff) | |
| download | frameworks_base-62ee3e9ab623a6ac1bb08a0b4db17e749315ac57.zip frameworks_base-62ee3e9ab623a6ac1bb08a0b4db17e749315ac57.tar.gz frameworks_base-62ee3e9ab623a6ac1bb08a0b4db17e749315ac57.tar.bz2 | |
am 15d1feb0: am fed2c410: am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
* commit '15d1feb0c183b09877317ea64be4e477bfb7fd3d':
Revert "docs: Watermark images with easter eggs"
Diffstat (limited to 'data/videos/VideoPackage1.mk')
0 files changed, 0 insertions, 0 deletions