OSDN Git Service

resolve merge conflicts of 44e07e0 to mnc-dev
authorChristopher Tate <ctate@google.com>
Wed, 20 Apr 2016 20:33:41 +0000 (13:33 -0700)
committerChristopher Tate <ctate@google.com>
Wed, 20 Apr 2016 20:33:41 +0000 (13:33 -0700)
commit825b7134699fbaaa16423c52b7b424d4a9afefb1
treeb937c65716245d46934893c5d785c5813ca168eb
parent224582e0403bb123da49d80af21f108900185769
parent44e07e07a1a1ec269ee0ef0963b452ea9a7c7158
resolve merge conflicts of 44e07e0 to mnc-dev

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