OSDN Git Service

am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
authorBaligh Uddin <baligh@google.com>
Mon, 29 Sep 2014 03:00:44 +0000 (03:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Sep 2014 03:00:44 +0000 (03:00 +0000)
commitf82c86c26c0ba9896b61270b48a8e4f82d7d7fde
tree83b461d1a1cae531068c9d2fcf23757554762f79
parentfdff96d385fdbbcb1d0a49853e89d60211a48cc7
parent1004713867fa4476201c02c95f35c64361a6dcf2
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '1004713867fa4476201c02c95f35c64361a6dcf2':
  Import translations. DO NOT MERGE