OSDN Git Service

am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 12 Oct 2015 19:42:31 +0000 (19:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 19:42:31 +0000 (19:42 +0000)
* commit '14bd3435f306d0ece1715c8bd32e843d0f836fdd':
  Import translations. DO NOT MERGE


Trivial merge