OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0bbfc26ecb ...
authorBill Yi <byi@google.com>
Sun, 2 Apr 2017 09:05:04 +0000 (09:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 2 Apr 2017 09:05:04 +0000 (09:05 +0000)
am: f83dc01d39  -s ours

Change-Id: Ibd10986f74a2da231ebb892985e2fba6fecf6312


Trivial merge