summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2013-12-12 08:44:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-12 08:44:37 -0800
commit720a40ae24d526268b3c0f2dd8497b5df2cc6f23 (patch)
treebba9ede1df9b4372f6580d408f64dbf408d50c84
parentac2c013b6cab1e25bc9381b5fe9685f29ee1d208 (diff)
parent052f96ed4203fa47511cdfe334404b49a95cfc36 (diff)
downloadandroid_frameworks_opt_colorpicker-720a40ae24d526268b3c0f2dd8497b5df2cc6f23.tar.gz
android_frameworks_opt_colorpicker-720a40ae24d526268b3c0f2dd8497b5df2cc6f23.tar.bz2
android_frameworks_opt_colorpicker-720a40ae24d526268b3c0f2dd8497b5df2cc6f23.zip
am 052f96ed: (-s ours) am bd624b68: (-s ours) Import translations. DO NOT MERGE
* commit '052f96ed4203fa47511cdfe334404b49a95cfc36': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions