tree f7369afb99b4e5d51ae023f3aed7290846a32e4e
parent b7ae3fd3b7fe8b7b78c6ba6e1bc7a33f65f57829
parent 3e4fd6ae9f2679471807d56e1d39e585bf2eb665
author Bill Yi <byi@google.com> 1569423680 -0700
committer android-build-merger <android-build-merger@google.com> 1569423680 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 820137653b -s ours am: 1091821c66 -s ours
am: 3e4fd6ae9f -s ours
am skip reason: subject contains skip directive

Change-Id: Ide090eeae27a9ae513a17ab390d482b5ac3d95e5