summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorRicardo Cervera-Navarro <rcervera@google.com>2014-04-18 19:16:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-18 19:16:23 +0000
commit15d1feb0c183b09877317ea64be4e477bfb7fd3d (patch)
treefb3d927dd6101f4d2ae666fd1df5b80c1ccb11ab /data
parentb90e504ec17a7f509521c21f2b937a2ebefaf6ab (diff)
parentfed2c410ab09de72931bc95380645a62746273bc (diff)
downloadframeworks_base-15d1feb0c183b09877317ea64be4e477bfb7fd3d.zip
frameworks_base-15d1feb0c183b09877317ea64be4e477bfb7fd3d.tar.gz
frameworks_base-15d1feb0c183b09877317ea64be4e477bfb7fd3d.tar.bz2
am fed2c410: am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
* commit 'fed2c410ab09de72931bc95380645a62746273bc': Revert "docs: Watermark images with easter eggs"
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions