OSDN Git Service

am 036400b3: (-s ours) am 21b8cb69: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 25 Jul 2014 17:05:27 +0000 (17:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Jul 2014 17:05:27 +0000 (17:05 +0000)
* commit '036400b3389a8f5707ce7ce14138cbf65f891e4b':
  Import translations. DO NOT MERGE


Trivial merge