tree f5efd104da0f00c1dfbeef0d8b51b9e4c561455a
parent bc77af5b4c2161d7bc1e2de7dc472f343d7f9581
parent a68c87eda84150b21f3d01511e60c720c6f6b695
author Chong Zhang <chz@google.com> 1384986260 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1384986261 +0000

Merge "Only scan for wifi display when there is no active connections" into klp-dev