tree b6c74782267317b7aa584e6ceab7d3c020dec2d2
parent e91aa3abf28d59bfd319b13464d828d2e80c69a8
parent 9815dd9c8baade5a04b23458e591aef7ebcc8172
author Xin Li <delphij@google.com> 1644564512 +0000
committer Xin Li <delphij@google.com> 1644564512 +0000

Merge sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: Iec90538bf8dd18fede035d7f548a71b757d2356c
Change-Id: Icfcc0dcab0a30472a6faff67e67e364386b98d41