diff options
| author | 2025-03-18 01:22:19 -0700 | |
|---|---|---|
| committer | 2025-03-18 01:22:19 -0700 | |
| commit | 2d3cc51c1c2b0f3f14f63b36f5524c31bb603823 (patch) | |
| tree | ec1d0a9c4cc5617bd7b6c7f254ae9ba4a6b61926 /libs/androidfw/AttributeResolution.cpp | |
| parent | 57e0889e58e3edc1bd7ec16ecd46de8c5fbf4066 (diff) | |
| parent | 7c4d9a6413cb35ec0cb61ad55a52d83c743d3b1d (diff) | |
Merge "Add VpnManager.TYPE_VPN_OEM_* constants for OEM use." into main am: f5b136e0d9 am: 7c4d9a6413
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3491439
Change-Id: If418ee756c3e2be12dcdb2b43d76ac90050651f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions