| commit | 8508485871dd22a998db98ea97403126918c5fa8 | [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 | 7888830d02350d6703d3046ea3a068f89ef7fa7c | |
| parent | 5710e72d91f16f34998ceccdd961ef9dc9e3cdb6 [diff] | |
| parent | 5a6bec53e224b2db9ecbc6920faab08f4a962256 [diff] |
am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp * commit '5a6bec53e224b2db9ecbc6920faab08f4a962256': Simplfy getActive* calls in ConnectivityService