tree d789df67e1c8e861c18317662da2077a32b156ed
parent 1daba7e6c3d1400f3c17d5c0c2cee28b6c199219
parent 57dfea56396ebb89b8e7932d575e0a93b7cbe046
author Bill Yi <byi@google.com> 1569421766 -0700
committer android-build-merger <android-build-merger@google.com> 1569421766 -0700

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

Change-Id: I665f00bf819cceab8f3e65f83a62a821b36e5907