OSDN Git Service

Merge "Pass all offload-exempt prefixes into OffloadController" into oc-dr1-dev
authorErik Kline <ek@google.com>
Tue, 4 Jul 2017 06:05:49 +0000 (06:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Jul 2017 06:05:49 +0000 (06:05 +0000)
commit324dfc989f6502bab1c1a525a3d634f401464722
tree7ea37e2634f841c7ccd389dd9525dce0bfca5e82
parent1ecac318d80a7c78b92b5471536cccd55af2d20e
parent1d8d34fa3eff2c6f9ed23909e1688af6cc4560d0
Merge "Pass all offload-exempt prefixes into OffloadController" into oc-dr1-dev
am: 1d8d34fa3e  -s ours

Change-Id: I7c3bdf71367f9f6888ffc76afb7e69de1a26c9f0