diff options
| author | 2023-10-12 21:13:55 +0000 | |
|---|---|---|
| committer | 2023-10-12 21:13:55 +0000 | |
| commit | c2b33a5b4f7b8b12441a989212b52e1dfa004038 (patch) | |
| tree | 25045a84f3709c2b9ce42816c9b0ff14b6048e2f /libs/androidfw/FileStream.cpp | |
| parent | 229e17eb42fbd23ea41a65799b22a6371374d740 (diff) | |
| parent | 1f29819db604234221fa9b96014e60163e7e2705 (diff) | |
Merge "[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2a2 am: ccc748a0d7 am: 2929859166 am: b11212b320 am: 3569c11009 am: 22454204a6 am: bf624d549f am: 4422416d9c -s ours am: 4f70c06650 -s ours am: 78e96991b1 -s ours" into udc-d1-dev-plus-aosp am: f43850daf7 -s ours am: 1f29819db6 -s ours
am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8cc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593
Change-Id: I6ba9d5f9111c6e8bb0dc30cd4a52f1fb718f8043
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