tree 98b7c1fad6d309c425feff705c757b24c985a2b8
parent 465d16d4366e1f4c64f48a8873e6775f8cb8d118
parent 844b1532be89e413d2908ea8d26562028940fe6e
author Geoff Mendal <mendal@google.com> 1413844419 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413844419 +0000

am 844b1532: (-s ours) am 2c373272: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '844b1532be89e413d2908ea8d26562028940fe6e':
  Import translations. DO NOT MERGE