tree 33d151b914cdb28e17e3febf0a284f22f04ed95e
parent bc8ad18f182d1b6b0051b0d10ca5d86b419b4eb6
parent 51712cc0fda0ba05c3b84ae39dbb344666647e61
author Xin Li <delphij@google.com> 1575476089 -0800
committer android-build-merger <android-build-merger@google.com> 1575476089 -0800

Merge Android10 QPR1 into AOSP master am: c6765102db
am: 51712cc0fd

Change-Id: I0dbc34c1fd61a741a9b3f924cb1d7676c432306e