OSDN Git Service

am bc566e74: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
authorBaligh Uddin <baligh@google.com>
Mon, 1 Sep 2014 21:43:56 +0000 (21:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Sep 2014 21:43:56 +0000 (21:43 +0000)
* commit 'bc566e745a8313ee63944d2e41b8f7b08d07f7cd':
  Import translations. DO NOT MERGE


Trivial merge