OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Fri, 6 Apr 2018 20:52:13 +0000 (13:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Apr 2018 20:52:13 +0000 (13:52 -0700)
commitaee045ac0888d3fad3bb900d418e839f9eeb61d0
tree51c6adaaa6b0361413d3a5c1b240a57469af397a
parentc12655f7def2191a7f6c0c3f563c9c9fbc489ba0
parent835e90b606e4f9f4ca2e2de8cccc6dbd76a5ab93
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 835e90b606  -s ours

Change-Id: I82e97e426bcbe37538fb04363a9780297b1e912d