OSDN Git Service

am eea96f22: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 13 Aug 2015 04:59:17 +0000 (04:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Aug 2015 04:59:17 +0000 (04:59 +0000)
* commit 'eea96f22a1ec156d78374f49352341c46c219ca0':
  Import translations. DO NOT MERGE


Trivial merge