tree 412be89921120e0ce7d20192311b618ab17192b3
parent d54e56907d63f363ffef250256f25fc4b8d8d133
parent 7f586601e9b6c64f2c51389ac2c4a5d59562affe
author Baligh Uddin <baligh@google.com> 1414957950 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414957950 +0000

am 7f586601: (-s ours) am 702965ef: (-s ours) am 717ed1e6: (-s ours) am bef50389: (-s ours) Import translations. DO NOT MERGE

* commit '7f586601e9b6c64f2c51389ac2c4a5d59562affe':
  Import translations. DO NOT MERGE