tree 4daa327ad78fafcddaa1ccbf1f22bb66fa04eac3
parent 623f2340fe60735e1db425dd03a70933127021a5
parent 62c1be7d0a6fbdac98be68d167f657b537d220e4
author Bill Yi <byi@google.com> 1547426423 -0800
committer android-build-merger <android-build-merger@google.com> 1547426423 -0800

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

Change-Id: I6f6472cb1779a14f4143c7a5c582e26a941a7b97