tree e9124f9a4b705e936dbc84ae61795ed41af94681
parent 428b467663ee84e312bd83473782da368052500d
parent 820137653bc2f0022119124e3380e63a7f41a0ad
author Bill Yi <byi@google.com> 1569421966 -0700
committer android-build-merger <android-build-merger@google.com> 1569421966 -0700

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

Change-Id: I67524d4e8046ef740f56978d85895f835631c810