OSDN Git Service

am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 14 Oct 2015 12:45:51 +0000 (12:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Oct 2015 12:45:51 +0000 (12:45 +0000)
* commit '26bb544ff277020444b79543302b015160ead18a':
  Import translations. DO NOT MERGE


Trivial merge