summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-10-20 14:23:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-20 14:23:03 +0000
commit3c88ca1670e514a03d487eda20d38faee543c556 (patch)
tree193be32873eec03dbecbfa2ac042080c78b3fcd3
parent2c560438a3bf3525abdd9ffb6ada898e69c02a64 (diff)
parentc79aee58401c6173486fede6cf1356fe7cb6791c (diff)
downloadframeworks_base-3c88ca1670e514a03d487eda20d38faee543c556.zip
frameworks_base-3c88ca1670e514a03d487eda20d38faee543c556.tar.gz
frameworks_base-3c88ca1670e514a03d487eda20d38faee543c556.tar.bz2
am c79aee58: (-s ours) am fdd10578: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'c79aee58401c6173486fede6cf1356fe7cb6791c': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions