OSDN Git Service

am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 30 Sep 2015 12:47:04 +0000 (12:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2015 12:47:04 +0000 (12:47 +0000)
* commit '49b491bb7634284a8622e48c88571aa59ba59ac7':
  Import translations. DO NOT MERGE


Trivial merge