OSDN Git Service

am 7d521a8f: (-s ours) am f598d0bc: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 12 Oct 2015 12:37:43 +0000 (12:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 12:37:43 +0000 (12:37 +0000)
* commit '7d521a8ff28ac8bc6110bc6eaff38c58bb792ca0':
  Import translations. DO NOT MERGE


Trivial merge