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:00:40 +0000 (00:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:00:40 +0000 (00:00 +0000)
am: 93111a9762

Change-Id: I9f39b8bbead5993bd147577a0452a19d56f71d35


Trivial merge