summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2010-06-10 18:59:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-10 18:59:42 -0700
commitf4f614f5edeeceddf1145df73b30f7066d00d7fa (patch)
tree8b203bdfb08707c5efd9f8b19e283ea53dbb43a5 /core
parent9d8e8dcc84fd9895d5b1cc49595b1715470ac05b (diff)
parent9f2a0115220c8e288c32d8cf90e235a2f2be115b (diff)
downloadframeworks_base-f4f614f5edeeceddf1145df73b30f7066d00d7fa.zip
frameworks_base-f4f614f5edeeceddf1145df73b30f7066d00d7fa.tar.gz
frameworks_base-f4f614f5edeeceddf1145df73b30f7066d00d7fa.tar.bz2
am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken * commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b': Remove indefinite DHCP retries
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions