[automerger skipped] Swap param order in registerSoftApCallback am: 8ca0f054ce am: f700ee27ab
am: 625051ddbe -s ours
am skip reason: change_id Idb38451e54b6cfbc32575023a8704debac5669f3 with SHA1 d541b9cfe9 is in history

Change-Id: Ibae5c89b25052c6a08bf4fc79f584cab79681620
tree: 054852be86f6715cc79f3e54b39e6b96185a7da0
  1. service/
  2. PREUPLOAD.cfg