Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba' * commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba': PowerManagerService needs yet another flag...
Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba' * commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba': PowerManagerService needs yet another flag...