OSDN Git Service

am c1fcf0a0: (-s ours) am 43e9ced1: (-s ours) am ea4dc6fc: (-s ours) am 718859d8...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 18:46:03 +0000 (18:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 18:46:03 +0000 (18:46 +0000)
* commit 'c1fcf0a02e5a64b54f517def70ab596dc2a2cc42':
  Import translations. DO NOT MERGE


Trivial merge