[automerger skipped] Merge "Swap param order in registerSoftApCallback" am: 76632c01fd am: 1f3415f36e
am:c03a31c46f-s ours am skip reason: change_id I5563c1059cc04014a0fd909e2508f7bf497d708e with SHA133379b361bis in history Change-Id: I512d10b0465aee2547a7bac514a0d227403991b9
This commit is contained in: