diff options
| author | 2022-08-19 16:21:18 +0000 | |
|---|---|---|
| committer | 2022-08-19 16:21:18 +0000 | |
| commit | d1b71a340c0dd9588e20dbf3b2ab30769274506f (patch) | |
| tree | 39eadc0d1cde37df02f64d40dcb06caba95c3a30 /libs/androidfw/StringPool.cpp | |
| parent | b96caa095031f84956fbcd15337a117f2a96c83d (diff) | |
| parent | 6c9d10502664c04c0ac7f1dab1edc6b117bd1774 (diff) | |
[automerger skipped] Merge "Skip sending VpnManager events for Settings VPNs" into tm-dev am: fab86f9cce am: 6c9d105026 -s ours
am skip reason: Merged-In I486398111106b1a9551fb29f92ba7b4fe85f68c1 with SHA-1 3912b21cbf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19415033
Change-Id: Ie5ed66ec35ed0cc6e21a707b29315add505fe2a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions