| commit | 4db32721644904e339e2a895a54f62ee4774e90f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:31:47 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 07:31:47 2012 -0700 |
| tree | ef0520c46824bfae1d128351b25d586259cf4a90 | |
| parent | c374d0805b84d9e0f42aefda11fa57915149097c [diff] | |
| parent | 65c8df8530418c66eedb06fa13372bcd41409492 [diff] |
am 65c8df85: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '65c8df8530418c66eedb06fa13372bcd41409492': P2P: Fix network removal to select correct block