tree c0d5a52fe0e788b7a1550cd0e6da95128176d41a
parent dca7f79e459abaa9de15c3381438ad267c1bc4a4
parent 8809318d46903ff60038f6d86aeae5a3e5942bdb
author Bill Yi <byi@google.com> 1558192061 -0700
committer android-build-merger <android-build-merger@google.com> 1558192061 -0700

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

Change-Id: Ibffc165f22ab88e26c2a03eb3d6737b9e2233f54