diff options
| author | 2022-08-19 17:40:24 +0000 | |
|---|---|---|
| committer | 2022-08-19 17:40:24 +0000 | |
| commit | e650b9a1aeb45987aebb33e14d8bf86bd01f5908 (patch) | |
| tree | 68b0d5f2e08aa5e33c0e7ad8634f5a2c236abd55 /libs/androidfw/StringPool.cpp | |
| parent | bed6e9c0642c11caf6a1f740ed64121a6230909c (diff) | |
| parent | 51d0819f230a86bcfa11e3b1f4797906943936be (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: 51d0819f23 -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: Ic6c1aa947e26a56b52fa3b31586c990e1776b0a6
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