OSDN Git Service

am 010d2fcd: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 5 Oct 2015 12:32:07 +0000 (12:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Oct 2015 12:32:07 +0000 (12:32 +0000)
* commit '010d2fcd2a4b8fda906ff0a0e04554475a45489c':
  Import translations. DO NOT MERGE


Trivial merge