OSDN Git Service

am b2568ed0: (-s ours) am 35e01bf7: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 19 Oct 2015 14:38:55 +0000 (14:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 14:38:55 +0000 (14:38 +0000)
* commit 'b2568ed0d1ae4cdaabcb061b2a503fece4aaa22a':
  Import translations. DO NOT MERGE


Trivial merge