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

* commit '0b6f830a6f9b2bfa410728f36fc518f96a8360ee':
This commit is contained in:
vandwalle
2014-09-16 00:02:45 +00:00
committed by Android Git Automerger

Diff Content Not Available