summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-12-01 19:59:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-01 19:59:55 +0000
commit06565f05be29d6b383c25c89984eb01e7c5c332c (patch)
tree722afd5f3eb8e540f8beedffeb63eebb14be532f
parente1077eefc3d76a376b4948fe50b3f293683f93f9 (diff)
parent2fd61cfbc12d9b20b9bde75dcb9381449b80d72e (diff)
am 2fd61cfb: (-s ours) am d48e7b85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '2fd61cfbc12d9b20b9bde75dcb9381449b80d72e': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions