diff options
| author | 2022-08-19 16:29:28 +0000 | |
|---|---|---|
| committer | 2022-08-19 16:29:28 +0000 | |
| commit | 51d0819f230a86bcfa11e3b1f4797906943936be (patch) | |
| tree | b024897ff29ccf56bec96cd75557bf33a2e3d0b6 /libs/androidfw/StringPool.cpp | |
| parent | 28c0f0ebbaa53eaaf5f28c134adab7b680b14a0c (diff) | |
| parent | d1b71a340c0dd9588e20dbf3b2ab30769274506f (diff) | |
[automerger skipped] Merge "Skip sending VpnManager events for Settings VPNs" into tm-dev am: fab86f9cce am: 6c9d105026 -s ours am: d1b71a340c -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: I2a57aa580ad7dd11d4a61a7df93711991f310ee3
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