OSDN Git Service

am f6cb6bab: (-s ours) am acbd8195: (-s ours) am 2bfd4a5f: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Mon, 27 Oct 2014 18:52:20 +0000 (18:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 18:52:20 +0000 (18:52 +0000)
* commit 'f6cb6bab0b225c7bfe4f9ddd07b10877e5d93769':


Trivial merge