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