| commit | eba3a7b8ad9632ac1e0fba8f48e60ab7c06c04fd | [log] [tgz] |
|---|---|---|
| author | Divya Sharma <c_shard@codeaurora.org> | Wed Nov 04 09:23:57 2015 -0800 |
| committer | Divya Sharma <c_shard@codeaurora.org> | Wed Nov 04 09:23:57 2015 -0800 |
| tree | 8624cfdbadbc0729d2ba4e11feae6b032a16027d | |
| parent | ac06e5223ab5ed1462d6c8346b2eaba207f449b7 [diff] | |
| parent | de2fa7133374831bcb5080a43e567e2e41f84ee7 [diff] |
Merge tag 'android-6.0.0_r26' into HEAD Android 6.0.0 release 26 * tag 'android-6.0.0_r26': extensions: libxt_socket: add --restore-skmark option xt_socket: add --nowildcard flag Change-Id: I40423d9feace8d9ac76bbdc1b288520fd58127e6