Merge "Use correct method for checking NETWORK_SETUP_WIZARD permission" into qt-dev
am: 6a5bb86797

Change-Id: I02c1e6e6c176da45a2013f87e18d9fff4b36d828
tree: 507303efa68a41e002912356c15e90206195a2a3
  1. service/
  2. PREUPLOAD.cfg