tree af68a5ce84770a4301cd6d542bcdd4d3778c869c
parent ce22a188cf761c977deb2413bf2c3898f433cdb8
parent 5e7182ce14eab6a7d8c4e353cecc005f0772cd8b
author Bill Yi <byi@google.com> 1564164815 -0700
committer android-build-merger <android-build-merger@google.com> 1564164815 -0700

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

Change-Id: Id4dbfde6947b3eb776b6f2e2f82f5e7dddfb1916