tree e9124f9a4b705e936dbc84ae61795ed41af94681
parent ac0c26af76045682dc4b8a58cdce3c2945971de3
parent 1091821c66dd37449e482682cc89205477782d30
author Bill Yi <byi@google.com> 1569422880 -0700
committer android-build-merger <android-build-merger@google.com> 1569422880 -0700

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

Change-Id: I929e0a2363ff261c59a4576dd3cf9641d7d7cf50