tree 367a3b34ee3d50c1e6e7f7ae367710199672e9ca
parent 89523569e4c1be2e102b5fb991023d6696384d76
parent 59db17673d9d2a5be386e9f324f8f2a7b455d0b1
author Baligh Uddin <baligh@google.com> 1404675745 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404675745 +0000

am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '59db17673d9d2a5be386e9f324f8f2a7b455d0b1':
  Import translations. DO NOT MERGE