summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-02-20 18:09:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-20 18:09:59 +0000
commit13e850160d21008597239dc974c805df057d4e1b (patch)
tree9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0
parenta935d31ca87146990010121b576506faef803404 (diff)
parent749e6b9cf21799aefe9accc50c60f6bfddf1545a (diff)
downloadframeworks_base-13e850160d21008597239dc974c805df057d4e1b.zip
frameworks_base-13e850160d21008597239dc974c805df057d4e1b.tar.gz
frameworks_base-13e850160d21008597239dc974c805df057d4e1b.tar.bz2
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 '749e6b9cf21799aefe9accc50c60f6bfddf1545a': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions