tree a4abc9268738fddb1fbb47a8baede6290e72acfc
parent 99e4a0f576bad57782b31f1b3329a3d2408f42ae
parent 89710842585404ea33f941afeb2c321e706005e9
author Robert Greenwalt <rgreenwalt@google.com> 1372268619 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1372268619 +0000

Merge "Fix power issues around wifi scans." into jb-mr2-dev