OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b81a56c 216a58c)
am 216a58c8: (-s ours) Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1
authorIrfan Sheriff <isheriff@google.com>
Fri, 4 Mar 2011 09:00:06 +0000 (01:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Mar 2011 09:00:06 +0000 (01:00 -0800)
* commit '216a58c882917926ccf450ae180c552d0de36a2b':
  DO NOT MERGE Proxy and IP fixes


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help