tree 9ec5cf21e248720c44289ca4db988f51805ddb59
parent b4a639876917a5f7e0cbde6b55b4c62286200ea2
parent 7f2a98967532138f3f962216ccf2d1a8307d42de
author Craig Mautner <cmautner@google.com> 1353958877 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353958877 -0800

am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev

* commit '7f2a98967532138f3f962216ccf2d1a8307d42de':
  Ignore invalid combination of PowerManager flags.