commit | 11a09d563510e3e14f93fe32b403027b10b61662 | [log] [tgz] |
---|---|---|
author | Mark Salyzyn <salyzyn@google.com> | Thu Feb 25 20:44:48 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 25 20:44:48 2016 +0000 |
tree | e0cf8466f870d8606e9addd5ebdc6b36c3785420 | |
parent | 131bd228c6991844efdad80301db85764b3be9b0 [diff] | |
parent | 9096ff130531c78ec21baa054c34c288628e3bb4 [diff] |
Merge changes Idaa6699d,Ic7759ef9 am: faf7946bd7 am: 7c72c0f28d * commit '7c72c0f28d55d528162ad8ad652a311a41d1f3be': logd: sock_alloc_send_pskb starves pruning logd: Allow (some) headers to be individually importable