OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 1 Jul 2016 05:09:18 +0000 (05:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 05:09:18 +0000 (05:09 +0000)
am: aac5c0e427  -s ours

Change-Id: I5ba367cb854039a4de86a36808296242e0258e3d


Trivial merge