OSDN Git Service

Merge "Making the content resolver work with result intents."
authorNicolas Prevot <nprevot@google.com>
Thu, 29 May 2014 17:02:19 +0000 (17:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 May 2014 17:02:20 +0000 (17:02 +0000)
commit1015efb143b51a5d31f2f932528f295cfa1add1f
treece94e750e387f2d5d0e11101b41d913120fdc5db
parent88d4c398eafa414b73e00b7bed1c98b944e8c183
parentc6cf95c0f5f7250c65e40c441fe58d8cbfd114c9
Merge "Making the content resolver work with result intents."
services/core/java/com/android/server/am/ActiveServices.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java