OSDN Git Service

am ea3f0326: (-s ours) am ea1724e2: (-s ours) am 38911d7a: (-s ours) am 093f3746...
authorGeoff Mendal <mendal@google.com>
Wed, 5 Aug 2015 14:50:18 +0000 (14:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Aug 2015 14:50:18 +0000 (14:50 +0000)
* commit 'ea3f0326b3043cf6672c9fbeb77c768b81a06e3d':
  Import translations. DO NOT MERGE


Trivial merge