Merge "DO NOT MERGE registerSoftApCallback Executor param"
am: db46c349d8

Change-Id: I5bedf30e2fb968e0192acd6419a13d1b9ccc4d40
tree: bd5dc3689b85da72758f40199b65a75ce5e1e638
  1. framework/
  2. OsuLogin/
  3. OWNERS