summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-02-20 23:01:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-20 23:01:37 +0000
commitf8ecdd0c72418e971a2e76dbddee3e84242ee4fb (patch)
treeb937df385a408d0709170f3f5b4252a38c22c96c
parent92d5a67d1bc3daf48386a026d60bf30415695049 (diff)
parent54de3ec25b309f51f4a05438fd0089d713cd5309 (diff)
downloadframeworks_base-f8ecdd0c72418e971a2e76dbddee3e84242ee4fb.zip
frameworks_base-f8ecdd0c72418e971a2e76dbddee3e84242ee4fb.tar.gz
frameworks_base-f8ecdd0c72418e971a2e76dbddee3e84242ee4fb.tar.bz2
am 54de3ec2: (-s ours) am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '54de3ec25b309f51f4a05438fd0089d713cd5309': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions