OSDN Git Service

Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
authorLorenzo Colitti <lorenzo@google.com>
Thu, 6 Jul 2017 16:09:30 +0000 (16:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 16:09:30 +0000 (16:09 +0000)
commitf00aadf535cf5b8480438aea634195ce1efe6f44
treec4e485b2923b87d23c4f643424f842250ff179cf
parent1ffc148c092471789d2dc44afd3eb6d316287139
parentd2eef601f61e1d0a624d0dc108a21df8d86f046f
Merge "Wakeup packet mark/mask configuration option" into oc-dr1-dev
am: d2eef601f6

Change-Id: Ibc89ffd87fb87cd95f941b2bbd67469d961cb13e