summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2015-03-20 21:03:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 21:03:06 +0000
commit1ac60d1cd6910aa20ab0acc581a430041144a234 (patch)
tree20c214bdeee84cffb633d02fff0572c3dba57e7c
parent5148cbced8ebf182dc7816174a39be060b433dd2 (diff)
parent2e800c017bc4400a360d002db5767a2142710186 (diff)
downloadandroid_frameworks_opt_colorpicker-1ac60d1cd6910aa20ab0acc581a430041144a234.tar.gz
android_frameworks_opt_colorpicker-1ac60d1cd6910aa20ab0acc581a430041144a234.tar.bz2
android_frameworks_opt_colorpicker-1ac60d1cd6910aa20ab0acc581a430041144a234.zip
am 2e800c01: (-s ours) am 70f7b1b6: (-s ours) am cb9247ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '2e800c017bc4400a360d002db5767a2142710186':
0 files changed, 0 insertions, 0 deletions