tree 73e112f4c708d6551205f6b6ac7e7f977ab85c16
parent ce4c57fd0e3014c5a26c1b8b43a61a1a728d8ea0
parent c8b4ef85dc059026c99aeaeb21a98c93bbebca70
author Erik Kline <ek@google.com> 1499840704 +0000
committer android-build-merger <android-build-merger@google.com> 1499840704 +0000

Merge "Restructure use of absent tether_offload_disabled setting" am: 5bb30496cf
am: c8b4ef85dc

Change-Id: I2210e9d25a4e7c497b9383324e574c9f8aca0d6f