OSDN Git Service

am d9960178: (-s ours) am cef6b220: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Mon, 25 Aug 2014 16:51:07 +0000 (16:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Aug 2014 16:51:07 +0000 (16:51 +0000)
* commit 'd9960178fda7184223cbc56c5dc11128ab1124b0':
  Import translations. DO NOT MERGE


Trivial merge