tree a42db374b08133ba59e95d53d0cc87623e4bcc6e
parent e0c3f3513639a5150a1627c8b57e7ddd4e82c9f0
parent 51ba6b1186ae474016a304d487b4d1c101dbaa6f
author Bill Yi <byi@google.com> 1547913126 -0800
committer android-build-merger <android-build-merger@google.com> 1547913126 -0800

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

Change-Id: I041cf56cc3684e98a3f135400ea12470c468dd95