tree 6739395c78ad8fb90cb1a207bfcb83e9ed910a0d
parent b28bbfee48f9e91bc8a509d675fb036789ee6a5a
parent c0a2649896691215420438bae1519955c69636c1
author Bill Yi <byi@google.com> 1555559834 -0700
committer android-build-merger <android-build-merger@google.com> 1555559834 -0700

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

Change-Id: I46e79d4b51d144c70ce7d7d51de1ba78cdbe8bc2