summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-02-20 18:13:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-20 18:13:43 +0000
commite16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a (patch)
tree9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0
parente9a5424cc64e44812383ab9e417f18b8a1f647d1 (diff)
parent13e850160d21008597239dc974c805df057d4e1b (diff)
downloadframeworks_base-e16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a.zip
frameworks_base-e16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a.tar.gz
frameworks_base-e16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a.tar.bz2
am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '13e850160d21008597239dc974c805df057d4e1b': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions