OSDN Git Service

Merge "Don't deliver broadcast to apps that are being backed up" into nyc-dev
authorAmith Yamasani <yamasani@google.com>
Tue, 24 May 2016 21:43:52 +0000 (21:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 24 May 2016 21:43:53 +0000 (21:43 +0000)
commitfc2a7ce7acc5ede8b26f35819c8287df1fed135c
tree154bc332a2bb053eb6c31cd3e4e5a7b6edc2852f
parent86f97177e959cb40229010b90f066fd602d6a06f
parentb5f3b5c2e5108b875fdb21726eeca41f58d59d49
Merge "Don't deliver broadcast to apps that are being backed up" into nyc-dev
services/core/java/com/android/server/am/ActivityManagerService.java