| commit | 4ce9f49c89e0ad124f950f535b63dc401117f0d8 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@google.com> | Sun Apr 17 07:52:25 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Apr 17 07:52:25 2011 -0700 |
| tree | c3a54fd675c838a7980f7a94adcb300cbb889997 | |
| parent | 32e6c583a586eabb10bb68e2a6ce0d4b2640fd16 [diff] | |
| parent | 17018c3fdfd2a3e17cb8ff950fea16ea1000506e [diff] |
am 17018c3f: Merge "Enable P2P 106 passive (again)." into gingerbread * commit '17018c3fdfd2a3e17cb8ff950fea16ea1000506e': Enable P2P 106 passive (again).