OSDN Git Service

am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process...
authorCraig Mautner <cmautner@google.com>
Mon, 7 Jul 2014 15:41:55 +0000 (15:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Jul 2014 15:41:55 +0000 (15:41 +0000)
commit0a9927025041a6dde3f3878bdd868a69ab1b3266
tree3496883eff825dee13b75d35191fbec6494d934b
parent53cc7d7998a9a656fe89ec8eba40ad479bded274
parent09c1af5d5c43f716fb4093eae6cf5442e7bb88d1
am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."

* commit '09c1af5d5c43f716fb4093eae6cf5442e7bb88d1':
  [ActivityManager] Prevent kill a restarted process again.
services/core/java/com/android/server/am/ActivityManagerService.java