OSDN Git Service

DO NOT MERGE Stop work challenge freeform bypass am: 0737c2b4c2
authorRobin Lee <rgl@google.com>
Wed, 7 Sep 2016 22:23:10 +0000 (22:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Sep 2016 22:23:10 +0000 (22:23 +0000)
commit32daa7a95cd49cbedf00c006cf80929518cc5465
tree193dd8a0c60fea117a9bda292d0784e450168869
parent36c4fc9779547aed633424967699564088940d80
parentec5ceae1743b64822cb7ca35d5938109a8beb370
DO NOT MERGE Stop work challenge freeform bypass am: 0737c2b4c2
am: ec5ceae174

Change-Id: Ic4bbce08944881f0d20a08c1ebb4db5531208f23
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java
services/core/java/com/android/server/am/ActivityStarter.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java