| commit | 030a04016ff243207f10d897c763aa7a50c4cadd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Mar 12 10:43:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 10:43:59 2021 +0000 |
| tree | 2ef8cd38244689dd8f93b84d72d76adb30d6bb1c | |
| parent | 5e3acd6be6108500ce29cc1c82314236d83d4ac1 [diff] | |
| parent | bb09bdec9425260f86078b7a2125e80057f480fc [diff] |
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 7b327e1bef am: 098ac69976 am: bb09bdec94 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I446cca57e6841c923ea89ce8f8eddfd1b8e60b79