OSDN Git Service

Merge "App Standby : Association between content providers and their sync adapter...
authorAmith Yamasani <yamasani@google.com>
Fri, 19 Jun 2015 22:08:09 +0000 (22:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 19 Jun 2015 22:08:13 +0000 (22:08 +0000)
commitb94761d0a48522b23c54f786445658bb58258da4
treec9ce8934b3ebc20fdef46834c697f60376e87f72
parenta36de70ad4c652fd6582630a15a941a7b85cc70b
parent37a40c24deb02bca3868a8085069afae112f22e4
Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java