| commit | f7ecb1aff4683dd3034247ca428eb8c0fb39f07c | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Mon Aug 29 16:33:00 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 29 16:33:00 2011 -0700 |
| tree | 286a869e58dbd6b0a28ca0533c88b41e9a9aee82 | |
| parent | b147e3e6e1919412c2cf22deea1ac3c739e24910 [diff] | |
| parent | 335e40c0f1c3aec550e61fa159130527fda597b6 [diff] |
am 335e40c0: Merge "Use seperate config file for p2p" * commit '335e40c0f1c3aec550e61fa159130527fda597b6': Use seperate config file for p2p