am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2

* commit 'ecce539f3d739fbf4b395639a485fddf51f688d6':
  Release wakelock after use

diff --cc core/java/android/net/DhcpStateMachine.java
index c49c019,ca95832..445b2f7
--- 1/core/java/android/net/DhcpStateMachine.java
--- 2/core/java/android/net/DhcpStateMachine.java
+++ b/core/java/android/net/DhcpStateMachine.java
@@@ -166,8 -167,9 +167,9 @@@ public class DhcpStateMachine extends S
              switch (message.what) {
                  case CMD_RENEW_DHCP:
                      Log.e(TAG, "Error! Failed to handle a DHCP renewal on " + mInterfaceName);
+                     mDhcpRenewWakeLock.release();
                      break;
 -                case HSM_QUIT_CMD:
 +                case SM_QUIT_CMD:
                      mContext.unregisterReceiver(mBroadcastReceiver);
                      //let parent kill the state machine
                      return NOT_HANDLED;