Merge "Swap param order in registerSoftApCallback" am: 1dcfd69218
am: 5d8b08254c

Change-Id: I0efdc1f3fd35fe059747b6ba2c6b0dc1731b3388
tree: 1c0adb4336e49e9c1d2f912c5d44cc5f23c8d778
  1. framework/
  2. OsuLogin/
  3. OWNERS