tree 6dd03122875df442c5d21a995c01729e80b8258e
parent c0bb4a19bb421045be67eae226280bb12fe2c6aa
parent 9594e887712d8dfca47c0f160a24cfb7a8262cb8
author Baligh Uddin <baligh@google.com> 1392930762 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1392930762 -0800

am 9594e887: (-s ours) am 37fe7d2b: (-s ours) am f42cf7de: (-s ours) Import translations. DO NOT MERGE

* commit '9594e887712d8dfca47c0f160a24cfb7a8262cb8':
  Import translations. DO NOT MERGE