OSDN Git Service

Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev
authorChristine Franks <christyfranks@google.com>
Wed, 2 Aug 2017 22:03:42 +0000 (22:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 22:03:42 +0000 (22:03 +0000)
commit27191ac475257cd28e3401b19604ddbf49044b3e
tree6a4d6a7dca9e75ccbe27f426d5b252151923ac20
parent9dbda410bca899a399e76f46dad9b0b566430774
parent8d753bc3a32bf99a47345b392e7d812cc2e0c49a
Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev
am: 8d753bc3a3

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