tree 05459836c0d8cce607e4c0684728e645558c9b21
parent 7c4a9e55f0614d89c24b71811066d2b19a450efe
parent 72b4c7c3df6be428e543c2a28f9b325e0e6d9f2b
author Baligh Uddin <baligh@google.com> 1392410331 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410331 +0000

am 72b4c7c3: (-s ours) am 3e6b26da: (-s ours) am cff2d6a2: (-s ours) Import translations. DO NOT MERGE

* commit '72b4c7c3df6be428e543c2a28f9b325e0e6d9f2b':
  Import translations. DO NOT MERGE