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

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