OSDN Git Service

am c0b5d542: (-s ours) Import translations. DO NOT MERGE automerge: c3068f0 -s ours...
authorBaligh Uddin <baligh@google.com>
Tue, 30 Dec 2014 12:14:29 +0000 (12:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Dec 2014 12:14:29 +0000 (12:14 +0000)
* commit 'c0b5d542b6f68dfcd0c90496d487986c9727da84':
  Import translations. DO NOT MERGE


Trivial merge