diff options
| author | 2023-07-18 00:45:56 +0000 | |
|---|---|---|
| committer | 2023-07-18 00:45:56 +0000 | |
| commit | 06665e8932e71ba251d48d8149221559da83b30a (patch) | |
| tree | e3ba38c6a6a26da69ffa23c4c50dc232f35663a1 /libs/androidfw/ZipFileRO.cpp | |
| parent | 9b3260aa354f44e6d99e8b3af7b385bc2db586d0 (diff) | |
| parent | 55a0f56c726b05e6e5a57c029249be181ebc4bc1 (diff) | |
[automerger skipped] Merge "Revert "Ignore BIND_ABOVE_CLIENT for same-process connections"" into udc-dev am: dd48adfac0 am: 55a0f56c72 -s ours
am skip reason: Merged-In Iee5024b8f13771bc98a39a20e5f96a89a4c79b4e with SHA-1 cd8f5d8b18 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23436583
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24031910
Change-Id: Ia83f5d74f1453bb1103fbc7e67217e80a68b4498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions