OSDN Git Service

am 715b4135: (-s ours) am aeae201d: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 27 Jul 2015 14:20:13 +0000 (14:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jul 2015 14:20:13 +0000 (14:20 +0000)
* commit '715b41355a01d8a5849eb689e20230d966ae9711':
  Import translations. DO NOT MERGE


Trivial merge