OSDN Git Service

am e4c1dccd: (-s ours) am 6df1ad97: (-s ours) am ba98cc2c: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 15 Sep 2015 14:32:12 +0000 (14:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Sep 2015 14:32:12 +0000 (14:32 +0000)
* commit 'e4c1dccda9719c1432b28eea90fbb0381d99638c':
  Import translations. DO NOT MERGE


Trivial merge