Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit ab5d28d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add SharedMemory.fromFileDescriptor" am:... 

[automerger skipped] Merge "Add SharedMemory.fromFileDescriptor" am: d0792368 am: b2cb2c79 am: 3950828a am: f8029596 am: 0c7e7c88 -s ours

am skip reason: Merged-In I11381e78580b97982b25a52aa06f2192def7353f with SHA-1 cebd3111 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1775625

Change-Id: Ifbf72728d5b4085cdb58b3cea32ee9515a6dbeac
parents b6f34fc4 0c7e7c88
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment