tree 9448d3a4dc821d18f7c466e1f2a5e96b42a9fb48
parent 626a92a75c72866907dec504f05ddcec99ba67c3
parent 66967329bcdb26cc2b9eadbceb2874b0e41e3753
author Bill Yi <byi@google.com> 1554618779 -0700
committer android-build-merger <android-build-merger@google.com> 1554618779 -0700

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

Change-Id: I761c0de62f1804965aeff8f00f44c4b1dbddcee2