tree 8bc5849fd778e49ee4506962304cd98df06b2a4d
parent 1ba41d446df930246cfed4b383cd656e7377d9ce
parent 82d7d3d88ba74906084570194a2ae99b3a9b6d74
author Bill Yi <byi@google.com> 1558190791 -0700
committer android-build-merger <android-build-merger@google.com> 1558190791 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7a762b564f -s ours
am: 82d7d3d88b -s ours
am skip reason: subject contains skip directive

Change-Id: I87e593e96a0a440a4c22b7405f2b21b5fb232bb3