OSDN Git Service

Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev...
authorChristine Franks <christyfranks@google.com>
Thu, 3 Aug 2017 00:55:15 +0000 (00:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:55:15 +0000 (00:55 +0000)
commit376988d5796597538cb70a934209ff0c9fadd3b1
tree16dded8fa626ec4a5df1d1ae1266536240ae879b
parentca7e0246b25f430a9d25db27831dcfe818b7c8d5
parenta336d8a57ba78466e2cdba01cacbf9cafadcab8e
Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3 am: 27191ac475" into oc-mr1-dev-plus-aosp
am: a336d8a57b

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