tree d62a088820cefcaff3cf385c1dfe7d1808b56e54
parent 4fe4bca1725d8205d00a36b656d2787b16e86984
parent 3d8f41913c43b3c82b20aef1572fc5a0f7126589
author Geoff Mendal <mendal@google.com> 1422291320 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422291320 +0000

am 3d8f4191: (-s ours) am 3ec4af9f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '3d8f41913c43b3c82b20aef1572fc5a0f7126589':
  Import translations. DO NOT MERGE