commit | 8dac08f7dbfe6f1424c59f8bc526fb17f5d2df7c | [log] [tgz] |
---|---|---|
author | Oli Lan <olilan@google.com> | Wed Jan 18 16:52:30 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 18 16:52:30 2023 +0000 |
tree | 32fefd204c42243bbfe740722b7ccb5259d115de | |
parent | 0084bd6acafa0b4820219fd13fbd4d97591226f0 [diff] | |
parent | 6c634f5c3e2dc19ec3fb7741952ce7491d3330e0 [diff] |
Merge changes from topic "lockdownvpnmainuser" am: 30eb737996 am: cf200064fe am: 6c634f5c3e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378890 Change-Id: I30dbcbcb7d9420916496256757de649e26794f44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>