diff options
| author | 2024-03-21 17:40:59 +0000 | |
|---|---|---|
| committer | 2024-03-21 17:40:59 +0000 | |
| commit | 3857a2ee27f3a72dfbe2a3edbf87729cd0cf555b (patch) | |
| tree | 456a3d2101916e351ff2a0d23097ee066020b7f8 /libs/androidfw/FileStream.cpp | |
| parent | 24fab05d01c6adce31fbef9b85aa59f4ddd23abf (diff) | |
| parent | 4b586f8a2b00eebef3756ce0980e3ddfe46e58e9 (diff) | |
[automerger skipped] Merge "Check for NLS bind permission when rebinding services" into sc-dev am: 73a43831b1 am: d806b6ec65 am: 6b6f85830a -s ours am: 4c519493f6 -s ours am: 4ac50bb542 -s ours am: b80712a5c3 -s ours am: be12a71070 -s ours am: ebe02fe8b4 -s ours am: 4b586f8a2b -s ours
am skip reason: Merged-In I11901755ec430c6e3145def9d67e4e63cda00806 with SHA-1 f126be35f4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26460033
Change-Id: Iabd43a0b86d3cc04102c6005a37b71b5d2ad4f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions