summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-10-19 22:16:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-19 22:16:55 +0000
commit25ee5c3e3b89595ca8ed97f9a66efc1b0e1bc2bf (patch)
treef8d4c47ceeee50d33fc48df1436cf46d31575fb1 /core
parentdbb5a3a745af4b9f27b3aad76b3cb1c1052dfddc (diff)
parent67b404d688e8da44d104d54c78a8e37f88a4529b (diff)
downloadframeworks_base-25ee5c3e3b89595ca8ed97f9a66efc1b0e1bc2bf.zip
frameworks_base-25ee5c3e3b89595ca8ed97f9a66efc1b0e1bc2bf.tar.gz
frameworks_base-25ee5c3e3b89595ca8ed97f9a66efc1b0e1bc2bf.tar.bz2
am 67b404d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '67b404d688e8da44d104d54c78a8e37f88a4529b': Import translations. DO NOT MERGE
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions