tree bfe6c272ddc1a42257e888d941eaf605f40bcbd1
parent f44b90fdc4be5243a25927e8ccf1880d958dd3b3
parent 1f6f7241ec9f675b5ed0adcdbb0a155defabbe4a
author Treehugger Robot <treehugger-gerrit@google.com> 1589525022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1589525022 +0000

Merge "Address nit from aosp/1301317"