commit | b85b9d04f0bf5c93a317c3385b3eb2a17e22bec4 | [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 | 509a4c8bd11e8e63ecac389707c4b3c8a4e69e63 | |
parent | c3b7651a0b9863e1c2201d1f970518748febc93b [diff] | |
parent | 3a146b660ee0f080850cf4383f3ed75f8ac12364 [diff] |
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: c899c4fee6 am: 3a146b660e am: bb09bdec94 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I446cca57e6841c923ea89ce8f8eddfd1b8e60b79