tree 19152c84d27e399f62f79b645205953e0b682ab2
parent d4dbd063cf88e70b045607aa865b2fdb2329bf45
parent 2621518b8802dc6ba656d166443b3b49d0d4a2ec
author Baligh Uddin <baligh@google.com> 1398220212 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398220212 +0000

am 2621518b: (-s ours) am f52da7a6: (-s ours) Import translations. DO NOT MERGE

* commit '2621518b8802dc6ba656d166443b3b49d0d4a2ec':
  Import translations. DO NOT MERGE