OSDN Git Service

am 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:00:23 +0000 (23:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:00:23 +0000 (23:00 +0000)
* commit '5d806912451dd81453aac72c9b7b2fa53e4f6096':
  Import translations. DO NOT MERGE


Trivial merge