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