tree 847bde34e76017e6a90cf2107c287761e502f7e0
parent bd50f67b550c2a3c4eb5fed881b8328f2d54c7d4
parent cae47380885a981cc6baec060f81a33cd8aa2a6f
author Xin Li <delphij@google.com> 1575476131 -0800
committer android-build-merger <android-build-merger@google.com> 1575476131 -0800

Merge "Merge Android10 QPR1 into AOSP master" am: 9d48201be3
am: cae4738088

Change-Id: I5b42791b7ca6b7e75267d302dc4a2ab70f7967de