tree 19926f4d958a7f83cda8b26bd6df3687b53f6ff1
parent 3f89da2e07ab55b43de9c464644dc49c9ad32d4f
parent 77aeea8219663861f611757cf60617e8303531d9
author Bill Yi <byi@google.com> 1558192356 -0700
committer android-build-merger <android-build-merger@google.com> 1558192356 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 21caa6f1d3 -s ours
am: 77aeea8219 -s ours
am skip reason: subject contains skip directive

Change-Id: I9e7cfc20513985b90a47e64b932fb8498b31b990