summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-02-20 18:03:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-20 18:03:05 +0000
commit8b297fb6ef42650a1126287aa0b610aa9a503167 (patch)
tree1c7669753ee3355ffc7a699a225cf5afda97794c
parent08394af265b02db7a76c4f4f4ae16b9d238e7580 (diff)
parent8027100fdb13c046838f9af12ef7bf2bc3ad511f (diff)
downloadframeworks_base-8b297fb6ef42650a1126287aa0b610aa9a503167.zip
frameworks_base-8b297fb6ef42650a1126287aa0b610aa9a503167.tar.gz
frameworks_base-8b297fb6ef42650a1126287aa0b610aa9a503167.tar.bz2
am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '8027100fdb13c046838f9af12ef7bf2bc3ad511f': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions