tree dba73df15b83cae03ae307d9d7456b4b56d0b94c
parent 05aa65cfb93edd6849e05420e2121c26ce138fda
parent 11176569e14d93e0a348a22d54e05ea78d6ecc76
author TreeHugger Robot <treehugger-gerrit@google.com> 1494564021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494564026 +0000

Merge changes from topic 'onarevert' into oc-dev

* changes:
  Create a NotificationChannel for ONA.
  Revert "Delete old WifiNotificationController strings."