| commit | 216a58c882917926ccf450ae180c552d0de36a2b | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Thu Mar 03 15:02:05 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 03 15:02:05 2011 -0800 |
| tree | 564828da44b3f34e7ad075899e25d0d43b8c06e6 | |
| parent | 436e1d2e919b9170a1cd5bb15a9bea6b2d209e0f [diff] | |
| parent | 00615cf5dc994f838092da6a22558d089a0e5087 [diff] |
Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1