tree 4579bb65858b7b4afa33583dd6b0f221b31bcc94
parent 2fe8ea211a1f91075aeaeb74b2a7ebb8ae6eaa57
parent 5f6ca22cea74955d5e19d7a13ba7d5046108b0fa
author Sasha Levitskiy <sanek@google.com> 1440652322 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652322 +0000

am 5f6ca22c: (-s ours) am daa60e5c: The P2P configuration file is wrongly set as STA configuration file

* commit '5f6ca22cea74955d5e19d7a13ba7d5046108b0fa':