diff options
| author | 2022-08-19 17:39:41 +0000 | |
|---|---|---|
| committer | 2022-08-19 17:39:41 +0000 | |
| commit | bed6e9c0642c11caf6a1f740ed64121a6230909c (patch) | |
| tree | 68b0d5f2e08aa5e33c0e7ad8634f5a2c236abd55 /libs/androidfw/StringPool.cpp | |
| parent | f5da061a8aca6477d1fb1929da87bb2fea57fde5 (diff) | |
| parent | 28c0f0ebbaa53eaaf5f28c134adab7b680b14a0c (diff) | |
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into sc-dev am: 53738ccfb3 am: 425d0d6592 am: 38a745d5cc -s ours am: edc4751265 -s ours am: 898f1624c5 -s ours am: b96caa0950 -s ours am: 28c0f0ebba -s ours
am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d3a is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19449015
Change-Id: Ib54beddb9d8a1c16429d4462c33f73f2b4cf4bb4
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