| commit | ef1fb4889a3436060a0f8e995f0e4112419e847d | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Wed Aug 31 16:43:22 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 16:43:22 2016 +0000 |
| tree | a85826b217d111892711ee01d6f4d39f14169856 | |
| parent | 61c0996d6f562ffefdacdb6aaf1142a917d9b255 [diff] | |
| parent | 680ec020a1fa4581d07c2d28ce90d7f052f23bda [diff] |
Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 am: 680ec020a1 Change-Id: I9b5622a91cf459844ee3513191b45994d51c86a7