OSDN Git Service

Merge "Import translations. DO NOT MERGE am: e1d30cc8b4 -s ours am: f127a35e6b ...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 4 May 2016 01:47:49 +0000 (01:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 May 2016 01:47:49 +0000 (01:47 +0000)

Trivial merge