| commit | cca5e721b241606fd1f4410561a1dbb3bbb69ab1 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Fri Nov 04 19:54:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 04 19:54:37 2016 +0000 |
| tree | 4ec03aa7eb146c3b0653b48274a7577c2c5c861b | |
| parent | 5d7123a18e3fdf4dea1a31ced32634e82c146272 [diff] | |
| parent | d32e7f4703d329104941828d5280f4f05438a489 [diff] |
Merge "libcutils: sockets_test breaks MAC build" am: 8d339e940f am: d32e7f4703 Change-Id: Ib67e7bde8bef48e2e2be5c7d045aa9a96b00d292