tree 6531519eeb145fe0fc4974199e02ea1455ecfa62
parent 9dd96ea86f618ca52dbb35e0a854e8924beeadce
parent 3fe947ba275abe253b71fed5feeafdced55201b6
author Baligh Uddin <baligh@google.com> 1402144417 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402144417 +0000

am 3fe947ba: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev

* commit '3fe947ba275abe253b71fed5feeafdced55201b6':
  Import translations. DO NOT MERGE