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