tree b5a9ea89c5c3ce6ea4039669e641e7fb6f3079f7
parent 15040e0a58b620e0fd75c8a6a8cd8b403aad5c22
parent cbd55abd81f6715b20dda70c8616534c89f50aec
author vandwalle <vandwalle@google.com> 1410300725 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1410300726 +0000

Merge "make autojoin associated scan period a config opttion" into lmp-dev