tree 603ce0520c6b4623ca0c4fa8000775ea8c3deb1a
parent a6abd1029d11de6144a40d9f4b91983d0e991020
parent f50989352fa4934ad2a3b9a627acc14d72af08ce
author Xin Li <delphij@google.com> 1575418508 -0800
committer android-build-merger <android-build-merger@google.com> 1575418508 -0800

Merge "Merge Android10 QPR1 into AOSP master"
am: f50989352f

Change-Id: I1eef810a5118f5097376b5924fe91b843d479a3b