summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2015-03-20 21:03:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 21:03:05 +0000
commit5148cbced8ebf182dc7816174a39be060b433dd2 (patch)
tree20c214bdeee84cffb633d02fff0572c3dba57e7c
parent7e99b1bb76a7c222affaade25d0607290b7e0f9f (diff)
parentf3a2bb195ec08960c54d8ad0e875a6c072c8abf5 (diff)
downloadandroid_frameworks_opt_colorpicker-5148cbced8ebf182dc7816174a39be060b433dd2.tar.gz
android_frameworks_opt_colorpicker-5148cbced8ebf182dc7816174a39be060b433dd2.tar.bz2
android_frameworks_opt_colorpicker-5148cbced8ebf182dc7816174a39be060b433dd2.zip
am f3a2bb19: (-s ours) am f8e8d1cd: (-s ours) am ce6b0b64: (-s ours) am b832145a: (-s ours) am 1869e1d2: (-s ours) Import translations. DO NOT MERGE
* commit 'f3a2bb195ec08960c54d8ad0e875a6c072c8abf5':
0 files changed, 0 insertions, 0 deletions