tree 1c95e401e88d04c6a6b99af30ff865c7659105b1
parent 41b42a949bf1e4b31a53827573957465e864a749
parent 253857d6a931667ccd47f638b5ff207fca7deade
author Bill Yi <byi@google.com> 1560477172 -0700
committer android-build-merger <android-build-merger@google.com> 1560477172 -0700

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

Change-Id: I993a36903f5715dbc69d16ba9a9c6fa1349fdac1