tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent 6be68be8c96c02ca8d308789a0340debfaf42265
parent 0711bc2a22b6360e0b93e3b3eedc757a3944be57
author Baligh Uddin <baligh@google.com> 1426893218 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893218 +0000

am 0711bc2a: (-s ours) am bb362b00: (-s ours) am 94a02826: (-s ours) Import translations. DO NOT MERGE

* commit '0711bc2a22b6360e0b93e3b3eedc757a3944be57':