tree b4a492a2879e8f46d621341d57801a7b85d7bac8
parent c614c5fcc843ddd2c561b2589e7088cb51e625a5
parent cf00986e9874c8798654e7bcb9d66f1844ee9f67
author Xin Li <delphij@google.com> 1636531564 +0000
committer Xin Li <delphij@google.com> 1636531564 +0000

Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: I6074236616646db7bfda7ea381af7b04775a4263
Change-Id: I8fbe24c4eafe4eccb1f552d8688e0b91ce1060c5