OSDN Git Service

resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b...
authorChristopher Tate <ctate@google.com>
Fri, 17 Jun 2016 06:50:28 +0000 (06:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 06:50:28 +0000 (06:50 +0000)
commit6bf184819c6f1239822b55815f076c2ba8932249
tree856679f2d446325190cc3380b24246296a737563
parentc2188c199d98170177caff38d1a237a73bf3a651
parent6b24c84fa22f1eb2610151dc5f085c450422706e
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c am: 1c3be1a5b1
am: 6b24c84fa2

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