tree 3950700b2772e0f6e56f29ba27fdc2870ff026f3
parent 2877877d4cb9ca220be28c136eee385550262354
parent 7c398083319bbd1ad51d23cb307cfc3ac9091c3a
author Pierre Vandwalle <vandwalle@google.com> 1426733881 +0000
committer android-build-merger <android-build-merger@google.com> 1426733881 +0000

Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev
automerge: 7c39808

* commit '7c398083319bbd1ad51d23cb307cfc3ac9091c3a':
  export API to disable autojoin scan initial implementation