OSDN Git Service

Merge "Idle timebase" into mnc-dev
authorAmith Yamasani <yamasani@google.com>
Tue, 12 May 2015 13:04:29 +0000 (13:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 May 2015 13:04:31 +0000 (13:04 +0000)
commitbb9d9278aa6fe3ba3d4c21b03d3e3da4543a974c
treee184b253d316feec89eb65c151bc8b0b4eaea522
parent6959865fb0de965b5a2c7a797bf26b8bf9d10228
parent06bf824628c118fbd5ad6756913d7fd63a6f4ce5
Merge "Idle timebase" into mnc-dev
services/core/java/com/android/server/DeviceIdleController.java
services/core/java/com/android/server/am/ActivityManagerService.java