OSDN Git Service

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

Change-Id: I21e6024cc68e7dc8647f3a9968db5a5d0b611899


Trivial merge