tree 01c126788b8e441f33128f7273bc0fb2ad8e8b58
parent e00dcd6b0db052b2ca7c3b34636c046b6e1a416e
parent 3412bb1e0d2d513023a3301234e5055a4835c178
author Geoff Mendal <mendal@google.com> 1417027459 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417027459 +0000

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

* commit '3412bb1e0d2d513023a3301234e5055a4835c178':
  Import translations. DO NOT MERGE