tree f2ec9d9a0da7a4f83383e084ed8807440ff2c261
parent 9946a9941843d1ac06169ac81312042f004cc0ae
parent e03631fbfdf7ee8a9f743982217c0f3996453cd5
author Xin Li <delphij@google.com> 1575476197 -0800
committer android-build-merger <android-build-merger@google.com> 1575476197 -0800

Merge "Merge Android10 QPR1 into AOSP master" am: 6bb1c31d3c
am: e03631fbfd

Change-Id: I1236631efe1c978b17c8205b051a487ddd725c14