tree beb85ecca10814ac765e584e40e16c5554db960e
parent f1b05619cc44b039721110955695fa261f1746da
parent 441d4f04d1e7a3223449add1c70d9d2831277d0e
author Geoff Mendal <mendal@google.com> 1417013406 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417013406 +0000

am 441d4f04: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '441d4f04d1e7a3223449add1c70d9d2831277d0e':
  Import translations. DO NOT MERGE