tree d007e8e9acc9df1d89e84025e2a0201a19c36644
parent b9a3b0c490fb9cdb69f2959e0b37ac46006b772b
parent de5cc27f0f19f6eebbb6d743950d6711b881dc63
author Salvador Martinez <dehboxturtle@google.com> 1526100462 -0700
committer android-build-merger <android-build-merger@google.com> 1526100462 -0700

[automerger skipped] Merge "Make it so client code does not tie tether to wifi" into pi-dev am: f005640b9c
am: de5cc27f0f  -s ours

Change-Id: I2b559714c89947bf38c50fbba97acdd4b1ef4dc2