OSDN Git Service

am 08a08b34: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Mon, 27 Oct 2014 18:52:42 +0000 (18:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 18:52:42 +0000 (18:52 +0000)
* commit '08a08b344bdf3d6aab0fae6d943ceca391f1a697':


Trivial merge