OSDN Git Service

am ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 29 Jul 2015 16:11:30 +0000 (16:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 16:11:30 +0000 (16:11 +0000)
* commit 'ff24828ed44a1d6c9ca8ba934f5cab4d092a728c':
  Import translations. DO NOT MERGE


Trivial merge