OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 16 Apr 2018 22:14:49 +0000 (15:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Apr 2018 22:14:49 +0000 (15:14 -0700)
commit71674cb7d23ec80a2e2aadabcd619f82fda421b4
tree77f282bcd941e6bf31587811a194cfb19e999987
parent160c30151fc3be6faf219712c2f079331bd09a94
parentf99a4a3e068ff9e908e970938685c9d110c32e14
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: f99a4a3e06  -s ours

Change-Id: Iea1d0a1bc534e1a50349782ab856013176a7ca66