tree 071e78ea49fd23e0d86ad3bf3a8a52db0172a9ce
parent 7b1331a00c8ad5a7fe35b46ff4376d4d289ca97a
parent d4ab028c6ce7a0d657196c598a575b0bbf41186a
author Eva Huang <evahuang@google.com> 1637741286 +0800
committer Eva Huang <evahuang@google.com> 1637741286 +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: I6098535187114d6ca3657603efe33f00709f3162