OSDN Git Service

am 0f3288e3: (-s ours) am 342ebca3: (-s ours) am 3f3dfcb1: (-s ours) am ccb925b1...
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 13:57:38 +0000 (13:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 13:57:38 +0000 (13:57 +0000)
* commit '0f3288e30ee2a0ec34926f68e9d4f5685d4ffd14':
  Import translations. DO NOT MERGE


Trivial merge