commit | 317466bd0c43b8ce2c03df49d50b2c8007a35138 | [log] [tgz] |
---|---|---|
author | Faye Yan <fayey@google.com> | Tue May 07 18:03:36 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 07 18:03:36 2024 +0000 |
tree | 9cbc1f537a3a1731d7f06e4ad3fca20429724d07 | |
parent | 22ed7392f91f13150eaed29a3b65ef62a2eae6fc [diff] | |
parent | f323bb19096e5a1c853da9867ae56b9852f473b9 [diff] |
[automerger skipped] Merge "Security fix for VPN app killable via lockscreen." into udc-dev am: a72e33cc90 am: f323bb1909 -s ours am skip reason: Merged-In I384699d478e5abcee3a165afc45211b9ed96334a with SHA-1 d7628d5621 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27145545 Change-Id: Ic47eebbb28172b0f557ffebe801a3036111a43fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>