OSDN Git Service

am c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74...
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:37:34 +0000 (23:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:37:34 +0000 (23:37 +0000)
* commit 'c3b7039c31eea15b1e45471ce1fac1f336a47ad5':
  Import translations. DO NOT MERGE


Trivial merge