OSDN Git Service

am 22a0c0e3: (-s ours) am 0fb5f9f3: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 29 Sep 2015 14:51:59 +0000 (14:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Sep 2015 14:51:59 +0000 (14:51 +0000)
* commit '22a0c0e3dc4198acab5828687a306d291288ad25':
  Import translations. DO NOT MERGE


Trivial merge