OSDN Git Service

Merge "Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1...
authorChristine Franks <christyfranks@google.com>
Thu, 3 Aug 2017 01:25:05 +0000 (01:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 01:25:05 +0000 (01:25 +0000)
am: f0747920e0

Change-Id: If2095bfcc7408c9ccbe5384f001339a84766d932


Trivial merge