OSDN Git Service

am f273d917: (-s ours) am 53f771d8: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 29 Jul 2015 23:02:07 +0000 (23:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 23:02:07 +0000 (23:02 +0000)
* commit 'f273d91741d382b66ecdba231b44a89688ae02d2':
  Import translations. DO NOT MERGE


Trivial merge