OSDN Git Service

Merge "Fix power manager issues." into jb-dev
authorCraig Mautner <cmautner@google.com>
Sat, 2 Jun 2012 18:24:29 +0000 (11:24 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 2 Jun 2012 18:24:29 +0000 (11:24 -0700)
commitd672b241f6720201e3b8f613363d71e4291b8597
treeaad7986a7dc8b7c29d29271a78598fa6561dd3e6
parentdba86e2dc1e89760670817f16da1d1db04ca85f7
parentd29568cf5f1d2ce22c0c3c5f32812b64bf958f63
Merge "Fix power manager issues." into jb-dev
services/java/com/android/server/PowerManagerService.java