tree f04ec356f4a53b592222d5fb38aa847a45d0a0e2
parent 5e4e14c4f18fcc0d8ed7d7ba790aedf10b0e14e7
parent 01a235bc9d295613cfc83f372ffb4e9fd4dd7c64
author Erik Kline <ek@google.com> 1459327735 +0000
committer android-build-merger <android-build-merger@google.com> 1459327735 +0000

Merge "Partially refactor Tethering to new network callback APIs" into nyc-dev
am: 01a235b

* commit '01a235bc9d295613cfc83f372ffb4e9fd4dd7c64':
  Partially refactor Tethering to new network callback APIs

Change-Id: I7a803c2c7570bd4eeef70ecf8dfacf951e76d3a1