| commit | 1b507045bda4ae64d0b1000bca877eb472e78c81 | [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 | 7a888c55e48704f426d429845b569a914b60bfe1 | |
| parent | 991f5f4ec987e55d53f6fe18b51ff3504ebd4ee7 [diff] | |
| parent | e0f7bc0b841c0b6a09fb7d5b259a6772b3a53df3 [diff] |
am e0f7bc0b: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp * commit 'e0f7bc0b841c0b6a09fb7d5b259a6772b3a53df3': Simplfy getActive* calls in ConnectivityService