| commit | 4a74b0f4780324ead8e567e8cd97a250afe4ef28 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Sat May 21 21:35:38 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 21 21:35:38 2011 -0700 |
| tree | dc6b00566431771934a0e1084a316317338b994e | |
| parent | c5fb0536deb269ad09004d2e9ae0a2695bed3e84 [diff] | |
| parent | 70b1bea6e1a389e15604ec2c78d2d374aeb0b945 [diff] |
am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp * commit '5a6bec53e224b2db9ecbc6920faab08f4a962256': Simplfy getActive* calls in ConnectivityService