tree 8899fdab7c077dea7fedf20337923fd28b119b83
parent 97a86592422864c18db17a55d82c372c07a0d413
parent 61f69e105f612ed49dfdc317d0915b3789321a1a
author Xin Li <delphij@google.com> 1575475818 -0800
committer android-build-merger <android-build-merger@google.com> 1575475818 -0800

Merge "Merge Android10 QPR1 into AOSP master" am: 249b9509db
am: 61f69e105f

Change-Id: Iedde40140a57b98ec9462ca9d72dae8ed3360956