tree e3a1898f9a7af88a445a741726a84a7760e0e00b
parent 1ee96040327b2174b18669313c70935276a5158c
parent c892fb1860038af181b305e3011d1afe86712710
author Geoff Mendal <mendal@google.com> 1413419530 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413419530 +0000

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

* commit 'c892fb1860038af181b305e3011d1afe86712710':
  Import translations. DO NOT MERGE