tree 57c45e0bd1e86409708e013eaca53be3e6952209
parent 3aa19006555e651dfc12d68d271247dbed8c6a39
parent 5e0a4a4e8150caec3f28e0884ae95bf4e69b57dd
author Baligh Uddin <baligh@google.com> 1394729429 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394729429 +0000

am 5e0a4a4e: (-s ours) am f0bea657: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly

* commit '5e0a4a4e8150caec3f28e0884ae95bf4e69b57dd':
  Import translations. DO NOT MERGE