tree 286a869e58dbd6b0a28ca0533c88b41e9a9aee82
parent b147e3e6e1919412c2cf22deea1ac3c739e24910
parent 335e40c0f1c3aec550e61fa159130527fda597b6
author Irfan Sheriff <isheriff@google.com> 1314660780 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314660780 -0700

am 335e40c0: Merge "Use seperate config file for p2p"

* commit '335e40c0f1c3aec550e61fa159130527fda597b6':
  Use seperate config file for p2p