tree 9b93deba282781ba4a3e3d8ee37f19f60c0826d7
parent 6b9d1fa3a4710bf4151485cd167e0ee910b0dff4
parent 3f10c6ec94e03417f2749b99bdb88552d7351f57
author Bill Yi <byi@google.com> 1558192715 -0700
committer android-build-merger <android-build-merger@google.com> 1558192715 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 21caa6f1d3 -s ours am: 77aeea8219 -s ours
am: 3f10c6ec94 -s ours
am skip reason: subject contains skip directive

Change-Id: Idd631a7f20b335cbad73310fa4673083a86f6608