tree e077ca9d13ef86a2589c42e576e40efcc40415f8
parent abaf436cb25666f8bb1bfbad06cc8462381838a9
parent 4c0d862711fb2019014a84182b6248478bc2b801
author Bill Yi <byi@google.com> 1568850159 -0700
committer android-build-merger <android-build-merger@google.com> 1568850159 -0700

[automerger skipped] Import translations. DO NOT MERGE am: d6feab9fca -s ours am: 638b36f628 -s ours
am: 4c0d862711 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie565602c4d25cff80ea061d17a0d760be7a393cd