tree b32cc259d2d23c8ddcc705544f13fccd3cae7aa2
parent 99c866ed0e0e7d88fd0657bdba9a8e6162ba2757
parent fd3d0614b76ae531d76a6a30a4ace4384d7450ed
author Xin Li <delphij@google.com> 1575475957 -0800
committer android-build-merger <android-build-merger@google.com> 1575475957 -0800

Merge Android10 QPR1 into AOSP master am: 47454c56de
am: fd3d0614b7

Change-Id: I239a24879a7922fe99eafc9bcf1cbc6d9d0eba45