diff options
| author | 2022-08-19 16:11:06 +0000 | |
|---|---|---|
| committer | 2022-08-19 16:11:06 +0000 | |
| commit | efbe51bea1adee0c4cae9f99e5bec2d7026f20e9 (patch) | |
| tree | f38ce9f43505d8ed241102528432069d53d554dc /libs/androidfw/ResourceTimer.cpp | |
| parent | b611c83fee6c3c9f3d2102f06de54cb46858b06d (diff) | |
| parent | fab86f9cce32a4130610272909afab42d13ccc6c (diff) | |
[automerger skipped] Merge "Skip sending VpnManager events for Settings VPNs" into tm-dev am: fab86f9cce -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/+/19415033
Change-Id: Id2e19c92f0dc4cd616077b2ad79f542f40c917ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions