summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/DhcpStateMachine.java
Commit message (Expand)AuthorAgeFilesLines
* am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2Irfan Sheriff2011-06-221-1/+9
|\
| * Release wakelock after useIrfan Sheriff2011-06-211-1/+9
* | am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""Irfan Sheriff2011-06-221-7/+18
|\ \ | |/
| * Revert "DO NOT MERGE Revert "Fix lease duration handling""Irfan Sheriff2011-06-211-7/+18
* | resolved conflicts for merge of 914ed90f to honeycomb-LTEIrfan Sheriff2011-06-221-0/+353
|\ \ | |/
| * Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""Irfan Sheriff2011-06-211-0/+353
|/
* DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"Irfan Sheriff2011-06-211-353/+0
* DO NOT MERGE Revert "Fix lease duration handling"Irfan Sheriff2011-06-211-18/+7
* Fix lease duration handlingIrfan Sheriff2011-06-151-7/+18
* DO NOT MERGE Add DhcpStateMachineIrfan Sheriff2011-05-121-0/+353