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