tree fe4abe801f77e3a3683589501c3e76026c9c7729
parent 42c8e85e5ef10e8a37d68be09d0bd4961f9045ad
parent 9789beae0eb926fb9291659ed32ec43dcde70820
author Bill Yi <byi@google.com> 1559097679 -0700
committer android-build-merger <android-build-merger@google.com> 1559097679 -0700

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

Change-Id: I6b392e470d952228315b12701d2256460126506e