Merge "Timeout associated with ack wakelock should be 200ms instead of 20sec."...
Merge "Timeout associated with ack wakelock should be 200ms instead of 20sec." into mm-wireless-dev am: 07ff9887
am: 162e0d50
* commit '162e0d50':
Timeout associated with ack wakelock should be 200ms instead of 20sec.