Josh Gao a70dcfb253 Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 79a632905b am: 49ccab2d41 ...

am: 97e14189cd

Change-Id: I34e6480f42957da27aeb6f8ccc6bd91d2304e590

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

..

android

Merge changes Iec53a9fd,Iac4cfe70 am: ab07d23ac3 am: 0032ba7e00

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