OSDN Git Service

Merge "Reduce race when connecting to an existing content provider." into nyc-dev
authorDianne Hackborn <hackbod@google.com>
Tue, 21 Jun 2016 19:18:36 +0000 (19:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 21 Jun 2016 19:18:39 +0000 (19:18 +0000)
commit5f9afa968dcb2477a992c4a95a898bca71b16c46
tree9e9ebb59a08ea25434453af734a74bc584dca7a3
parent1e7d8d381768ddb8868ba50612a1e48d44bfce6f
parent4de5a3ac6655f76b67af38712ae5aeb6d7c15938
Merge "Reduce race when connecting to an existing content provider." into nyc-dev
services/core/java/com/android/server/am/ActivityManagerService.java