OSDN Git Service

am 8ac88edc: (-s ours) am e957cb47: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 24 Dec 2014 18:57:57 +0000 (18:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Dec 2014 18:57:57 +0000 (18:57 +0000)
* commit '8ac88edc032abfb3d1105f3f2b66ef5c39d1cf8f':
  Import translations. DO NOT MERGE


Trivial merge