2c164747d3
Merge commit 'f7872780ca3dae9584251b1e3495aed12110254c' into gingerbread-plus-aosp * commit 'f7872780ca3dae9584251b1e3495aed12110254c': PowerManagerService needs yet another flag...