OSDN Git Service

Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 12af7eb3ab...
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 21:26:57 +0000 (21:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 21:26:57 +0000 (21:26 +0000)
am: a03869b296  -s ours

Change-Id: I98ab1b5e5cea8124c59a99007610b6c8ec809762


Trivial merge