Merge "net: wireless: bcmdhd: Android Packet Filter (APF) [DO NOT MERGE]" into mm...
authorSreenath Sharma <sreenath.sharma@broadcom.com>
Fri, 11 Mar 2016 23:09:52 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Mar 2016 23:09:52 +0000 (23:09 +0000)
commitd574753981bc6dac55c5640bda81d3be35e0527e
tree329e3920cfea2d90294d46fe323f9f29790ee832
parent8f11146f8d958b305913ecda8220f3f67cf83ca1
parentf8eb896622cec2823d2dab4f64311105396bdf55
Merge "net: wireless: bcmdhd: Android Packet Filter (APF) [DO NOT MERGE]" into mm-wireless-dev
am: f8eb896622  -s ours

* commit 'f8eb896622cec2823d2dab4f64311105396bdf55':
  net: wireless: bcmdhd: Android Packet Filter (APF) [DO NOT MERGE]