tree e4252e22a8a1716c8c5eda5b2f8ea2a96ea109fc
parent acf9750118dbcc1b54319f59a7381b9278b222ce
parent d595d265f04f6d9f610a2f8dfdee65f9025fd918
author Bill Yi <byi@google.com> 1567216646 -0700
committer android-build-merger <android-build-merger@google.com> 1567216646 -0700

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

Change-Id: I3b7728ea50f17bfcb92153699909602836b9fd27