[automerger skipped] WifiServiceImpl: Allow setWifiEnabled for system apps am: cdebeb98bb -s ours am: d8e9d04342 -s ours am: 8684c28bd8 -s ours
am: d5e7afad6d -s ours
am skip reason: change_id I095f9755c60034064e467dedcdb16b33dc63d9eb with SHA1 bc68567d3b is in history

Change-Id: I07c042f3111bd14399fd843e72c71400651d01f9
tree: 349aeb2e9c9f0bc5c51ecc6b5ee1d8e6618bcf95
  1. service/
  2. PREUPLOAD.cfg