OSDN Git Service

am e552d003: (-s ours) am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be...
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:37:31 +0000 (23:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:37:31 +0000 (23:37 +0000)
* commit 'e552d003412958f09168f239ab802b9af29fcfe8':
  Import translations. DO NOT MERGE


Trivial merge