am 8de91ce1: am 7f2a9896: Merge "Ignore invalid combination of PowerManager...
am 8de91ce1: am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev
* commit '8de91ce1':
Ignore invalid combination of PowerManager flags.