am 5751f816: Merge "Add contentobserver for nsd_on setting" into jb-dev

* commit '5751f816f06454ea48bc25f56051878e0ce82dc1':
  Add contentobserver for nsd_on setting
tree: e94f913ceb5f37480d0081538f40f5d94c6656ce
  1. core/
  2. services/
  3. wifi/