diff options
author | Baligh Uddin <baligh@google.com> | 2015-03-20 21:03:06 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 21:03:06 +0000 |
commit | 1ac60d1cd6910aa20ab0acc581a430041144a234 (patch) | |
tree | 20c214bdeee84cffb633d02fff0572c3dba57e7c | |
parent | 5148cbced8ebf182dc7816174a39be060b433dd2 (diff) | |
parent | 2e800c017bc4400a360d002db5767a2142710186 (diff) | |
download | android_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