summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-08-17 14:16:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-17 14:16:10 +0000
commit70f7b1b6deb5ba2ccefb121b60d285e79598ff17 (patch)
tree0ab9f5066e7fe522540774e39282baffb608138f
parentf8e8d1cdd4f8c70d085117f40ecf6226462f5e3c (diff)
parentcb9247ce4b78730e5af265afd57114572ebb3053 (diff)
downloadandroid_frameworks_opt_colorpicker-70f7b1b6deb5ba2ccefb121b60d285e79598ff17.tar.gz
android_frameworks_opt_colorpicker-70f7b1b6deb5ba2ccefb121b60d285e79598ff17.tar.bz2
android_frameworks_opt_colorpicker-70f7b1b6deb5ba2ccefb121b60d285e79598ff17.zip
am cb9247ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'cb9247ce4b78730e5af265afd57114572ebb3053': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions