OSDN Git Service

am 98680095: (-s ours) am 0ab8fabb: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)
* commit '98680095aa996ffd2633ae1ab1a4bb7b237ce4ce':


Trivial merge