tree eaa113bd4bb5f52de29ff0349a1d371170af57ab
parent e037c0b1ad9bb82fd069bd09fe9582864d922466
parent 7e40778bae0c58173116fb7e6d250abfdb9b5250
author Baligh Uddin <baligh@google.com> 1412024561 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412024561 +0000

am 7e40778b: (-s ours) am 37960312: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7e40778bae0c58173116fb7e6d250abfdb9b5250':
  Import translations. DO NOT MERGE