OSDN Git Service

am b22c59e2: (-s ours) am c488631e: (-s ours) am cbf24e12: (-s ours) am 2deb87d4...
authorBaligh Uddin <baligh@google.com>
Sat, 19 Sep 2015 18:15:47 +0000 (18:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 19 Sep 2015 18:15:47 +0000 (18:15 +0000)
* commit 'b22c59e2f60e96e7ff2166ea657963c35cf7f29c':
  Import translations. DO NOT MERGE


Trivial merge