| commit | 1a868d36c6d5a832bdd662ae26f62f37ff833ed8 | [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 | 46fcde2521016d0406c12e203472c99f5b64c57d | |
| parent | 8f6d376746d79a8791f509a28dcb8ddd4d725858 [diff] | |
| parent | 8be27ca06c6e4ef3838f63d1b6a5be05ae6de700 [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.