tree d85f36c6bb1e833d173456de407bf26ac80b63ee
parent 2de9e02d2bd6009343097852129022db88cc7b07
parent 000da1ae0baf1bcf3ff8462636f4be2401b7278a
author Xin Li <delphij@google.com> 1575350715 -0800
committer Xin Li <delphij@google.com> 1575350715 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Idf59a52fdc74034813ce48a7ed2c35d097a7ca92