| commit | e2b177a5d1384ebbb82d576637364e5b24450beb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Jul 12 12:59:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 12:59:27 2014 +0000 |
| tree | 4510f48bc3ec30d4b58db4c166c4711fb64cad26 | |
| parent | b962ab81fc37fc8b4b8cfd45d3538b641dd6fd13 [diff] | |
| parent | 83ce99d8b7e2b15b2169e6e6e18e871ad35abb6c [diff] |
am 83ce99d8: Merge "Define SIOCKILLADDR which isn\'t in the common kernel uapi headers." * commit '83ce99d8b7e2b15b2169e6e6e18e871ad35abb6c': Define SIOCKILLADDR which isn't in the common kernel uapi headers.