OSDN Git Service

Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1
authorIrfan Sheriff <isheriff@google.com>
Thu, 3 Mar 2011 23:02:05 +0000 (15:02 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 3 Mar 2011 23:02:05 +0000 (15:02 -0800)
commit216a58c882917926ccf450ae180c552d0de36a2b
tree564828da44b3f34e7ad075899e25d0d43b8c06e6
parent436e1d2e919b9170a1cd5bb15a9bea6b2d209e0f
parent00615cf5dc994f838092da6a22558d089a0e5087
Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1
res/values/strings.xml