OSDN Git Service

am a3353476: (-s ours) am 32156a75: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 25 May 2015 15:16:43 +0000 (15:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 May 2015 15:16:43 +0000 (15:16 +0000)
* commit 'a335347624b60cb64d0bbacc17b966d0d7384aa6':
  Import translations. DO NOT MERGE


Trivial merge