summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2015-03-23 22:28:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-23 22:28:25 +0000
commit83415d5e2efd78b9f86f976d33155040be45f75f (patch)
tree318f4b618c2ccf5d7c3a229751c1916f844407c9
parentaab4767b5e6364fcfa72ed39716c0e159e5d70d0 (diff)
parentafb167eb8e457ac8b3f815b5e26de0530508d962 (diff)
downloadandroid_frameworks_opt_colorpicker-83415d5e2efd78b9f86f976d33155040be45f75f.tar.gz
android_frameworks_opt_colorpicker-83415d5e2efd78b9f86f976d33155040be45f75f.tar.bz2
android_frameworks_opt_colorpicker-83415d5e2efd78b9f86f976d33155040be45f75f.zip
am afb167eb: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
* commit 'afb167eb8e457ac8b3f815b5e26de0530508d962':
0 files changed, 0 insertions, 0 deletions