OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: e97044...
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 21:26:51 +0000 (21:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 21:26:51 +0000 (21:26 +0000)
commitdd96209efbab1e6d1f3fc41bf12be11039dea12b
treecec317eb3d6613e7e6f7fa86e5d1e6fff6f70875
parentb5c4ed4c0b95bd968635a6aed67f1e02e0e29bb3
parent326344d20ce54b742524342dcd5f2a2bf5a514e8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: e970444839  -s ours
am: 326344d20c  -s ours

Change-Id: Iee048c4f7737bde065c2d42ef540e904bb614cb4