OSDN Git Service

am 9e974a89: (-s ours) am a67f961f: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 26 Aug 2015 16:46:09 +0000 (16:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Aug 2015 16:46:09 +0000 (16:46 +0000)
* commit '9e974a89366a935031a3cab98a1a71addfd30024':
  Import translations. DO NOT MERGE


Trivial merge