OSDN Git Service

am d46f31f6: (-s ours) am eb7ed429: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 14 Feb 2014 20:51:22 +0000 (20:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 20:51:22 +0000 (20:51 +0000)
* commit 'd46f31f60cc502c1403fa8210861294b10fe2994':
  Import translations. DO NOT MERGE


Trivial merge