summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-02-20 17:59:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-20 17:59:45 +0000
commite69b7b3474c356438fbd65e43438e72ebda0bacb (patch)
tree2bfa2c18b11c19595086ee509e59012739aa4c09
parent55542ee6449bd580f61bc005726b5c87773fbe25 (diff)
parent46a02249d7bde3fb88cc5312f88dab6d1690e20e (diff)
downloadframeworks_base-e69b7b3474c356438fbd65e43438e72ebda0bacb.zip
frameworks_base-e69b7b3474c356438fbd65e43438e72ebda0bacb.tar.gz
frameworks_base-e69b7b3474c356438fbd65e43438e72ebda0bacb.tar.bz2
am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '46a02249d7bde3fb88cc5312f88dab6d1690e20e': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions