am f38b709e: (-s ours) am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread

* commit 'f38b709e470849943befbe88a0daeb7324f5114b':
  DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver