tree fc51bb568fdb244bd4cc7687a665230a1f3a9fa4
parent f9709883f17b7115e1a77f449d71dd67c88160c0
parent 0b172415fdc13fb50108abcd11871aba58e8425c
author Bill Yi <byi@google.com> 1555156593 -0700
committer android-build-merger <android-build-merger@google.com> 1555156593 -0700

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

Change-Id: If5cfd25a964ca17fe36abe979de0f1ea6fe21d92