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