tree e6865227ff1ff8afa3c98b6603c199e162badf19
parent 2fb112c9bbb7123b6ecd9420e8d02240a9869f7b
parent 2bc9f4178a1f7851c54e91c8d2e6e98a50729742
author vandwalle <vandwalle@google.com> 1410308155 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410308155 +0000

am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev

* commit '5e811150b9d538d0e59a367d8d75a20d85a12549':
  make autojoin associated scan period a config opttion