tree 0da454e29d390d45b92f260b7a27158e5e6ded42
parent 27e72fc0310987ecc4ce115f2c265b7b3f770bb0
parent aeefa69a882eb1068da3a45cec82e50971c45df2
author Lorenzo Colitti <lorenzo@google.com> 1385484507 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385484507 -0800

am aeefa69a: (-s ours) am 8a234809: Merge "Use BaseNetworkObserver in Tethering."

* commit 'aeefa69a882eb1068da3a45cec82e50971c45df2':
  Use BaseNetworkObserver in Tethering.