OSDN Git Service

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

Change-Id: Ib6a392258a18132121ba073f27a420d071abfae4


Trivial merge