OSDN Git Service

am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 29 Oct 2014 20:56:00 +0000 (20:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 20:56:00 +0000 (20:56 +0000)
* commit '4c79a9ecc0124d85e66aa3041c6b65b8582f4c87':
  Import translations. DO NOT MERGE


Trivial merge