OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 19:21:53 +0000 (19:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 19:21:53 +0000 (19:21 +0000)
commit73af74db6ccd29b6b603b68f4c7987fdeeb87c63
tree84d6cd9d01bd5ce148b9695405af19a3d92175da
parentedc08f4382f4e0dd9f0867ea8570454d7fe6a128
parent85e4a97789820424a23a6a63db4f851f1d8d42bb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 85e4a97789  -s ours

Change-Id: I97dd7864f151d03d6fa048720a039b81f84145a2