tree 22c56c00bb0175f63d1dafee59dcd19389fe42f2
parent 5cc9ace295921560e6dd2183472d2347f68509f8
parent 361d6da737a2d95cdaa15918d71c9555024e578f
author Xin Li <delphij@google.com> 1575418388 -0800
committer android-build-merger <android-build-merger@google.com> 1575418388 -0800

Merge "Merge Android10 QPR1 into AOSP master"
am: 361d6da737

Change-Id: If10199827c4e23ae281821cc182522be6ce842fc