tree 75988931c7c198843410137593276a343009f91b
parent ad2a9886cac4dc682bdda7e48a84cd147332d985
parent c75f378cc94307297a6ce8ca5d071499c05feb8a
author Bill Yi <byi@google.com> 1553422261 -0700
committer android-build-merger <android-build-merger@google.com> 1553422261 -0700

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

Change-Id: I9222ea8815b60d92a7955472056f74cd6669f9fe