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)
am: d2eef601f6

Change-Id: Ibc89ffd87fb87cd95f941b2bbd67469d961cb13e


Trivial merge