tree 1fda4e581cd581bbd556c27f3d874e4406aa56c2
parent 59bde8429b1faa24e60957eca3db07214d43c1ea
parent f3a1007af01d49db4af2d8152b781c55ee2f7bca
author Baligh Uddin <baligh@google.com> 1415376160 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415376160 +0000

am f3a1007a: (-s ours) am 6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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