From: Ed Heyl <ed@google.com>
Date: Mon, 31 Oct 2011 13:06:27 +0000 (-0700)
Subject: merged by hand (services/java/com/android/server/PowerManagerService.java needs to... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/2e251749f6546b9071945e144f26f04f9e9cb6d0

merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)

Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928
---

2e251749f6546b9071945e144f26f04f9e9cb6d0