tree 6739395c78ad8fb90cb1a207bfcb83e9ed910a0d
parent 5d448d8d00145cb17ade0a1a075e0a8b0b834c80
parent 8a8ead03b9b13362c7d403dcbbc1bc3eb9c50f30
author Bill Yi <byi@google.com> 1558763743 -0700
committer android-build-merger <android-build-merger@google.com> 1558763743 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7cf55f2a69 -s ours
am: 8a8ead03b9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie9210be78fd031949eaede852d451ae9089a6cae