tree 23b762785b3079a2c23d6591c086892f02e8c990
parent 992f747392233063892bc6234984630361abdfac
parent 61c0b1a6f5f342db1a1971806075149fa31375b2
author Treehugger Robot <treehugger-gerrit@google.com> 1615539467 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1615539467 +0000

Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor"