tree b7ab0af76118d4227d58c098c5db7991ece384b9
parent 6b60b35b4b7d8a0bb373d2032c3113acbd410e97
parent 4a8558e9d8e25d039fd4f5f1a994f5e0b9141988
author Bill Yi <byi@google.com> 1569421647 -0700
committer android-build-merger <android-build-merger@google.com> 1569421647 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 92214baec2 -s ours
am: 4a8558e9d8 -s ours
am skip reason: subject contains skip directive

Change-Id: I94d0b4fdcab116c3d626def7833fa013506d7ecb