tree 0d442806bc9945dd949680161f3687441b66331f
parent fdb18b812a7f11ba34cea6fc36eb94a58e831574
parent 9287dc553576cf52311df5810a00a5ad197a0181
author Xin Li <delphij@google.com> 1575476108 -0800
committer android-build-merger <android-build-merger@google.com> 1575476108 -0800

Merge "Merge Android10 QPR1 into AOSP master" am: 5728efac3d
am: 9287dc5535

Change-Id: Ia72178868afa8931bea15380f233998e3d98b2f1