am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread

Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba'

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