OSDN Git Service

Merge "Pass all offload-exempt prefixes into OffloadController" into oc-dr1-dev am...
authorErik Kline <ek@google.com>
Tue, 4 Jul 2017 06:11:51 +0000 (06:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Jul 2017 06:11:51 +0000 (06:11 +0000)
am: 324dfc989f  -s ours

Change-Id: I3edead8bdcff10cfc07e4c061cac89943d0cd974


Trivial merge