OSDN Git Service

am 4e9cb4e2: (-s ours) am c7167010: (-s ours) am 9139d5b0: (-s ours) am 4155d9f3...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 23:18:21 +0000 (23:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 23:18:21 +0000 (23:18 +0000)
* commit '4e9cb4e294f4227afb5589509efb6d95a208a8de':
  Import translations. DO NOT MERGE


Trivial merge