tree be14db0e911577d36c96d4b90762ba7a59e7e3e9
parent 514f61185878d22a8f28eb3eb159a46235b1684c
parent 1e1238e1249e2ed611c7acc6d36617667b57d98f
author Eva Huang <evahuang@google.com> 1637741430 +0800
committer Eva Huang <evahuang@google.com> 1637741430 +0800

Merge branch 'android-msm-barbet-4.19-sc-security' into android-msm-barbet-4.19-sc-qpr1

Jan 2022.1

Bug: 204278602
Change-Id: I3dad163c435883d099cdff4810b0ed2074fe7859