tree 38479899ae5f794971e22949c27aa389d5a58c4d
parent c8e684aa92b9a4259ea040c4031e8d40fd9c9e3b
parent d114851ae963ca08599078f33b57210bf11063b2
author Xin Li <delphij@google.com> 1575418552 -0800
committer android-build-merger <android-build-merger@google.com> 1575418552 -0800

Merge Android10 QPR1 into AOSP master
am: d114851ae9

Change-Id: I04f4ffa012a68ac2a450972b13a961fc111dbabd