commit | 1aa2809596931b0ee436ac1499322dfdae263b71 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Wed Dec 23 18:23:42 2015 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Wed Dec 23 18:23:42 2015 -0800 |
tree | 7855602a63d58798df6366dd5b5ac9c97891c7ba | |
parent | 6def6b0a9bfefcf4f632d33a9d8f019283a4356a [diff] | |
parent | 21135783a9f2946bdf6fe30b0a72f406cb086abc [diff] |
Merge "init: Don\'t ignore setsockcreatecon errors" am: 07cb69415a am: 17c0edc6ee am: 5bef33472b * commit '5bef33472b353535143ce78a68810542f310beef':