tree 372aa2b4d785acc4d7e54488d648037f98491fa9
parent 4777b612e07f57afbcf362b78b0b6e1e5e77e8bb
parent 0134869b5c81771ae3e3251fa42ac6c478e62f5a
author Geoff Mendal <mendal@google.com> 1426511692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426511692 +0000

am 0134869b: (-s ours) am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '0134869b5c81771ae3e3251fa42ac6c478e62f5a':
  Import translations. DO NOT MERGE