OSDN Git Service

am 7100f0cb: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:00:40 +0000 (23:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:00:40 +0000 (23:00 +0000)
* commit '7100f0cb8965dd364f8f11732ff4d644f476a1b4':
  Import translations. DO NOT MERGE


Trivial merge