tree 51ca55298479e4f60a064050e77d5da60931da3b
parent ce91d1195ccf9eed5d308efe92b9732c16a449ca
parent 6b3f8ee6d5ae1542230da83234d666b6cc5b4043
author Bill Yi <byi@google.com> 1569422686 -0700
committer android-build-merger <android-build-merger@google.com> 1569422686 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 167b632453 -s ours
am: 6b3f8ee6d5 -s ours
am skip reason: subject contains skip directive

Change-Id: I3df9b34dde7d07be66668b7a3111132cd626d232