tree 44a2c03632707c37a8aace9aee0ae313ba539574
parent 66ce952a4e34cf1eb9dbe3b1d10809bc5c1edc66
parent 7606d4798bc0fcc227b6f08779f5435908fd9021
author Jeff Sharkey <jsharkey@android.com> 1501719945 +0000
committer android-build-merger <android-build-merger@google.com> 1501719945 +0000

Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev
am: 7606d4798b

Change-Id: Id2b9df26bc9752e10b7ff1a3b981d2721eb747a9