tree a4abc9268738fddb1fbb47a8baede6290e72acfc
parent a0b9e1eead9cbde980ca5ee8406100d9f3bb8d4d
parent 2f50097a5d5a1fb60574c89c7202cc43ecb51c54
author Robert Greenwalt <rgreenwalt@google.com> 1372269095 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372269095 -0700

am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev

* commit '2f50097a5d5a1fb60574c89c7202cc43ecb51c54':
  Fix power issues around wifi scans.