tree 379d10573421fb8808b23cfe38f8de8fcd401caf
parent e6fdb19f83435a90a0bbf45b4f3c2125977c2bf4
parent 43efa7e7772c95dbb8d693a1c8585056aef5ec06
author Bill Yi <byi@google.com> 1562631014 -0700
committer android-build-merger <android-build-merger@google.com> 1562631014 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 43efa7e777 -s ours
am skip reason: subject contains skip directive

Change-Id: I7b281a09596e58ce00f91dfc697f9acf04832003