tree 71e25f0163386f3e4c1530337f59e7e4cd1e7f4e
parent 22065f290cd6d52a7d72e165759bf8b3b536e17c
parent 7dcd09433094e1585a6c454081c15f4878c2ee94
author Bill Yi <byi@google.com> 1563234012 -0700
committer android-build-merger <android-build-merger@google.com> 1563234012 -0700

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

Change-Id: I617998135fe62588290b83f5d9b1eab984967f40