OSDN Git Service

resolved conflicts for merge of 6abcec1d to master
authorWale Ogunwale <ogunwale@google.com>
Tue, 31 Mar 2015 16:53:39 +0000 (09:53 -0700)
committerWale Ogunwale <ogunwale@google.com>
Tue, 31 Mar 2015 16:53:39 +0000 (09:53 -0700)
commit29382d29618f9f51fe8cde77d2dfd8e0b6e1071d
tree584668fe668eac7bad9369ae78bb251f54c014bb
parent6cedefa2e4a10724982a72e22abc349c7578902d
parent6abcec1d7653dce2dc057879b7cdbe3ff94259f3
resolved conflicts for merge of 6abcec1d to master

Change-Id: I28986f8863298a767a8290b02d5418d4d1d42d17
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ProcessRecord.java