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

Change-Id: Id2555682f7917175326287a8758b8c617ef747d4
tree: 545668186c038ea3daea0542124fc6f6ca83cc53
  1. service/
  2. PREUPLOAD.cfg