OSDN Git Service

resolved conflicts for merge of 6f357d32 to master
authorJeff Brown <jeffbrown@google.com>
Thu, 16 Jan 2014 19:44:20 +0000 (11:44 -0800)
committerJeff Brown <jeffbrown@google.com>
Thu, 16 Jan 2014 19:44:20 +0000 (11:44 -0800)
commit09d30981f8e882ffaa336aa4665bfe348557895a
treef146e7f462d50382bc79e79c4ecb4f8681555bf7
parentd3ee63b6c6999475288502ccd37eb8840fb8a1c0
parent6f357d3284a833cc50a990e14b39f389b8972254
resolved conflicts for merge of 6f357d32 to master

Change-Id: I1979e6ed1acddbe656f5010114fd900f10865e75
core/java/com/android/internal/os/BatteryStatsImpl.java
services/core/java/com/android/server/SystemServer.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/BatteryStatsService.java
services/core/java/com/android/server/am/BroadcastQueue.java
services/core/java/com/android/server/firewall/IntentFirewall.java
services/core/java/com/android/server/pm/PackageManagerService.java
services/core/java/com/android/server/wm/WindowManagerService.java