tree 4cef82b77e5cb47cc4d8fa3cf0782c6df18a42ff
parent dffa10eaa4ee752b533f7215426a4aba841e3ebd
parent 9821a0ab9fb4fc6ae1a38e643d93c9ef7b961981
author Baligh Uddin <baligh@google.com> 1408732846 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408732846 +0000

am 9821a0ab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '9821a0ab9fb4fc6ae1a38e643d93c9ef7b961981':
  Import translations. DO NOT MERGE