OSDN Git Service

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


Trivial merge