OSDN Git Service

am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 22:45:29 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:45:29 +0000 (22:45 +0000)
* commit '2e51738d7c93e547dbd484014e11d770270030e0':
  Import translations. DO NOT MERGE


Trivial merge