tree 139eb899867740a78202aac875301c68567e263e
parent ffd26f28d1b92cc5bee11a3a29c36ee0c4046c70
parent 749945454a5d0658caea291e7371c22631869116
author TreeHugger Robot <treehugger-gerrit@google.com> 1494564050 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494564050 +0000

Merge changes from topic 'onarevert' into oc-dev

* changes:
  Move ONA back into the wifi framework.
  Revert "Move WifiNotificationController to NetworkRecommendation"