OSDN Git Service

am 15685632: (-s ours) am adb0a906: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 22 May 2014 03:17:17 +0000 (03:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 May 2014 03:17:17 +0000 (03:17 +0000)
* commit '15685632e0e62651ccfb6bfa2013afe715768126':
  Import translations. DO NOT MERGE


Trivial merge