tree 32ca7b9738e84fb86c91fbdc4151c5e275c7b8ed
parent d1ee1a649fc95fa7233efb254e07d3a5cd648603
parent 5ceb563f51464164896fa57db091502c9cfbd03b
author Josh Gao <jmgao@google.com> 1547852147 -0800
committer android-build-merger <android-build-merger@google.com> 1547852147 -0800

Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets."
am: 5ceb563f51

Change-Id: Ib8c818a3038877b87187659b0ff65a9d31b998e7