tree 803a656b991669b8011c8c28c62f7a5f2145d502
parent 88c72a925b4f03093d1cb74fdae2a8a5920ba087
parent 1fbadbba17c332ed831e792a2199a1dff5335e36
author Bill Yi <byi@google.com> 1560484323 -0700
committer android-build-merger <android-build-merger@google.com> 1560484323 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 1308522cd5 -s ours am: 5dfae2112f -s ours
am: 1fbadbba17 -s ours
am skip reason: subject contains skip directive

Change-Id: I01ade10783d9841b8f207ce08b0129794388ef9a