OSDN Git Service

am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 5 Oct 2015 12:45:22 +0000 (12:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Oct 2015 12:45:22 +0000 (12:45 +0000)
* commit '0070fbfe01eab83402949298188322f1168b5b3c':
  Import translations. DO NOT MERGE


Trivial merge