[automerger skipped] Merge "Add SharedMemory.fromFileDescriptor" am: d079236881 am: b2cb2c7994 am: 3950828ac0 am: f8029596bd am: 0c7e7c8882 -s ours

Browse Source

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

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

Change-Id: Ifbf72728d5b4085cdb58b3cea32ee9515a6dbeac

...

This commit is contained in:

Treehugger Robot

2021-08-21 17:12:57 +00:00

committed by Automerger Merge Worker

parent b6f34fc48e 0c7e7c8882

commit ab5d28d594

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available