OSDN Git Service

am ec5a5213: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 21:06:00 +0000 (21:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 21:06:00 +0000 (21:06 +0000)
* commit 'ec5a52136e344305fac60f6053fe4c36aa24ceb8':
  Import translations. DO NOT MERGE


Trivial merge