OSDN Git Service

am 48f0021c: (-s ours) am 0905bb07: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 1 Oct 2014 22:30:42 +0000 (22:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Oct 2014 22:30:42 +0000 (22:30 +0000)
* commit '48f0021cec8943c3027f41faff147b83ba6d991f':
  Import translations. DO NOT MERGE


Trivial merge