]> git.saurik.com Git - android/aapt.git/commitdiff
merged by hand (services/java/com/android/server/PowerManagerService.java needs to...
authorEd Heyl <ed@google.com>
Mon, 31 Oct 2011 13:06:27 +0000 (06:06 -0700)
committerEd Heyl <ed@google.com>
Mon, 31 Oct 2011 13:06:27 +0000 (06:06 -0700)
Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928


Trivial merge