tree e0f24447e8450dc82089875cde59c2fb615d41a3
parent 025e2563ec5df0a8a33d6fda0122f4f34a6136af
parent c1f7a824f86c1c730adabab844c428dd3170d41f
author Bill Yi <byi@google.com> 1550777708 -0800
committer android-build-merger <android-build-merger@google.com> 1550777708 -0800

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

Change-Id: I58ae274a134c457f7ed6cfb16bdd44c82e676584