commit | eb07ceef7c196bc0e938670c13a9d56b5859421f | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jun 22 18:39:16 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 22 18:39:16 2016 +0000 |
tree | c9a98bdbe4e86453d76a1ed114f4e867479ca710 | |
parent | dde14a6d4d3bfc9824d01eb457f43633bf7f831b [diff] | |
parent | a5953fb9440c2d2cd16ae357518267420cd96be3 [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