OSDN Git Service

am 5e0a4a4e: (-s ours) am f0bea657: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 13 Mar 2014 16:50:29 +0000 (16:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 16:50:29 +0000 (16:50 +0000)
commit844e2a6a085efafa9370e5402968ee1cb76be7c7
tree57c45e0bd1e86409708e013eaca53be3e6952209
parent3aa19006555e651dfc12d68d271247dbed8c6a39
parent5e0a4a4e8150caec3f28e0884ae95bf4e69b57dd
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