OSDN Git Service

am b02410c4: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:34:59 +0000 (11:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:34:59 +0000 (11:34 +0000)
* commit 'b02410c44f384bd9a59707818593938d05163244':


Trivial merge