tree 51e084f270dcb662c4b1df940bef37642c98ce71
parent 967fddebb4d544d59a53fcefd83f4ca9875d3249
parent 947f521c7da2618276f9242989effd2b06341d16
author Xin Li <delphij@google.com> 1575475586 -0800
committer android-build-merger <android-build-merger@google.com> 1575475586 -0800

Merge Android10 QPR1 into AOSP master am: 00e3cfffba
am: 947f521c7d

Change-Id: I3bb8015f3c0b05dd62814e28d0ab17f16bdcc826