tree 195f84514b10a505d6472e8b1d6f0d61929195ca
parent a7c206856c3582d4d713fa834e92751b5d1fbfa8
parent 44767762caea5f473d08fd4cc6db157a5fbcdc34
author Baligh Uddin <baligh@google.com> 1411322533 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411322533 +0000

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

* commit '569d3d30043f07d15abc6cfcafc1d27056c1c096':
  Import translations. DO NOT MERGE