tree f52bd099f09d85a0ee2e2e56426774e56eea86bf
parent 9910c14ec26b78d4fbe665daeca37ac3d8dff742
parent b1878fbbe142f0977866e658c3b9db67b498028c
author Bill Yi <byi@google.com> 1550348346 -0800
committer android-build-merger <android-build-merger@google.com> 1550348346 -0800

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

Change-Id: Ie9d9bc1f455acea32cf7b2fda11c3717eedc42cd