tree c2e2d2e0daf31456ea557a934e9c3e18833b7e45
parent a0aee21fcd9efe24e974c46827fef2f14cb30119
parent d6feab9fca52fcd1b7609b4b2701592fb6b17de8
author Bill Yi <byi@google.com> 1568849288 -0700
committer android-build-merger <android-build-merger@google.com> 1568849288 -0700

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

Change-Id: Ib1e67bd2313fe62b99abb44723d5654195cc227a