OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 04:23:11 +0000 (04:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 04:23:11 +0000 (04:23 +0000)
am: f81b519438  -s ours

Change-Id: I92d23239291c708c36e0096719ed0420fa360ef2


Trivial merge