diff options
| author | 2022-07-27 06:45:33 +0000 | |
|---|---|---|
| committer | 2022-07-27 06:45:33 +0000 | |
| commit | cd5b8e72eecbc65b4d6877dc5077eab81c50ad7a (patch) | |
| tree | ab565c650a08b3624703104e6b28800ba7595219 /libs/androidfw/AssetsProvider.cpp | |
| parent | 1048bed9a2e2614bd6ade598c2aac83a2953f37c (diff) | |
| parent | 687d38bf1d20e6b4a18112a18e96ee42e3fee6f8 (diff) | |
[automerger skipped] Merge "Skip sending VpnManager events for Settings VPNs" into tm-qpr-dev am: 687d38bf1d -s ours
am skip reason: Merged-In I228f62a5e09017dbf985a614f2e42434238a220c with SHA-1 5a684c6362 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19430851
Change-Id: I640a1bf5b03f7600bfddabf8e1151cfd8217f08d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions