OSDN Git Service

Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev
authorAmith Yamasani <yamasani@google.com>
Thu, 11 Aug 2016 20:48:26 +0000 (20:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Aug 2016 20:48:27 +0000 (20:48 +0000)
commit792aaab77a3514b268c192717f2da25a58dc40fb
tree7beb4b6f9ce026f8b10f147d90a18eb4a90c8520
parentefa21a9924aeb94fb7bb8a7d2524653aec78afcc
parentd86e14e45c15cd1a17925d9cb131471d496ab389
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev
services/core/java/com/android/server/am/ActivityManagerService.java