tree a8cea23517f7d00deb0531282974427080ae272e
parent 4712046fbfd6103af0f495a771498122e02a9c6a
parent 9ea82b2e918830a090b5a294b135523102d8aa5f
author repo sync <isheriff@google.com> 1313700232 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1313700232 -0700

Merge "Use supplicant control channel interface for p2p"