OSDN Git Service

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

Change-Id: I2e0a3c68e4e0d0adf65186cb803fc1f2f51725a3


Trivial merge