tree fd9168c60ac7adda5cbfd5a9ea670a55da36f001
parent 3d3c98f5b2bfafef5ffdec790f79f8b94c45e30e
parent 1a8b3cab32b3ed68640485dc051e7f943be74a13
author Bill Yi <byi@google.com> 1557026467 -0700
committer android-build-merger <android-build-merger@google.com> 1557026467 -0700

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

Change-Id: I7cb5d68cd9707958dbcf004e77e71445cd61a982