Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister softap callback check"
am: d86e0cb12f

Change-Id: I2ecd1ec6f34bdf1a611f48a6b6a3f589dc30ccc7
tree: c6d5623b1d557827ab5f26772f2d9f7b78fb9887
  1. service/
  2. PREUPLOAD.cfg