| commit | 352f2c33d3b8a0b73dcdab98c7a77f698578b048 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Mar 30 16:40:23 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 30 16:40:23 2011 -0700 |
| tree | d31f2822625e2f8037889ec2403aeb1d9e670170 | |
| parent | ce8a55db6feae11c1db45a868a7d8a0e7d105471 [diff] | |
| parent | 047f9d12976d90d0931a64a256bb4843d77f5e20 [diff] |
am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp * commit '047f9d12976d90d0931a64a256bb4843d77f5e20': Fix some alt-network issues.