tree 028debd2851eac6aa8335f18f7d7bd75321d35b5
parent 8bbb1e454842c37084795fd90494d22729047aca
parent d4174d616e7ce055bceae9116cb6499126214a71
author Bill Yi <byi@google.com> 1550348706 -0800
committer android-build-merger <android-build-merger@google.com> 1550348706 -0800

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

Change-Id: I727e64b8bbda8e57497a68d55e09b6bfdd473197