| commit | 6074e79feab9b20326594657bb4859949da407e5 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Jun 22 18:55:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 22 18:55:30 2016 +0000 |
| tree | ad89361461299598b2e0e5285f1192fad004fc3f | |
| parent | 5b902d6f1fa3a9b9bd4079be9bd95225d3b5efa1 [diff] | |
| parent | eb07ceef7c196bc0e938670c13a9d56b5859421f [diff] |
Merge \"DO NOT MERGE: adb: use asocket\\\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours am: 2dff6490fd am: 31fc3c3be6\" into nyc-mr1-dev-plus-aosp am: a1ddb6f5e7 -s ours Change-Id: I5e129d5fbd3815fb3b50afc3151bc153eede14a3