tree e799035ccb35194bb0d84b98f11923164be148b5
parent 37cb37bea8a920c974b304d18b19f87bae820193
parent e8f3bc8c314c1c0e6aa18dd78fb053dbaec71261
author Bill Yi <byi@google.com> 1558192214 -0700
committer android-build-merger <android-build-merger@google.com> 1558192214 -0700

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

Change-Id: If519bda4e765b8842b84b6bc3a4a280deb038d35