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