Josh Gao 5d7a742b8d Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 5ceb563f51 am: 39ac4fe5bf ...

am: 5363d5be5d

Change-Id: I34e6480f42957da27aeb6f8ccc6bd91d2304e590

2019-01-18 15:57:06 -08:00

..

android

Merge changes Iec53a9fd,Iac4cfe70 am: 8621e44c39 am: 4a4e693e3e

2019-01-16 02:03:06 -08:00

com/android

Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets."

2019-01-18 22:25:35 +00:00