tree 9102a533f05cb125a389c150a1f5a2fc627d36af
parent 1e744735a38892ab50048893dd4568e649d2e65e
parent 3ba4f476ffb6aa5e232250a65cf5b548f5c9d980
author Bill Yi <byi@google.com> 1563234552 -0700
committer android-build-merger <android-build-merger@google.com> 1563234552 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7dcd094330 -s ours
am: 3ba4f476ff -s ours
am skip reason: subject contains skip directive

Change-Id: Ic3f5e71ff435b1dc03e02f7448789e0d4f9538e4