tree 1786364d13ae8d685d6c2f3281ca2e4e83779562
parent d027d78cd53028e70d40f2c9f3041fef2f7f20f8
parent daa60e5cc09fc4ad1a7c1b914d04e741e0052556
author Sasha Levitskiy <sanek@google.com> 1438891346 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438891346 +0000

am daa60e5c: The P2P configuration file is wrongly set as STA configuration file

* commit 'daa60e5cc09fc4ad1a7c1b914d04e741e0052556':
  The P2P configuration file is wrongly set as STA configuration file