tree 2665c8d8acf7455978b53d990f455a615d6d4631
parent 3d0754e664f848aeed94685962c9f0d8c708a929
parent 14627b110153b054a7c5b1f4187d3012f7da83b5
author Xin Li <delphij@google.com> 1575418366 -0800
committer android-build-merger <android-build-merger@google.com> 1575418366 -0800

Merge "Merge Android10 QPR1 into AOSP master"
am: 14627b1101

Change-Id: I1c84db81be660ae2481fd6caf8cd511e48262401