OSDN Git Service

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


Trivial merge