summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-09-29 21:02:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-29 21:02:55 +0000
commitdbc35f463b0375d4bc0c732b052452354a5c37d9 (patch)
treeeaa113bd4bb5f52de29ff0349a1d371170af57ab
parentb5480f653fc8242a36053709b5cea570358518e6 (diff)
parent3e7c3c397bfd0f20db6719222218b349c3552e4d (diff)
downloadframeworks_base-dbc35f463b0375d4bc0c732b052452354a5c37d9.zip
frameworks_base-dbc35f463b0375d4bc0c732b052452354a5c37d9.tar.gz
frameworks_base-dbc35f463b0375d4bc0c732b052452354a5c37d9.tar.bz2
am 3e7c3c39: (-s ours) am e98a55e8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '3e7c3c397bfd0f20db6719222218b349c3552e4d': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions