OSDN Git Service

am ec5d4aa1: (-s ours) am a78321d7: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 24 Sep 2014 18:08:50 +0000 (18:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Sep 2014 18:08:50 +0000 (18:08 +0000)
* commit 'ec5d4aa1f7ed1a03747655438a60d21e9971d2e7':
  Import translations. DO NOT MERGE


Trivial merge