OSDN Git Service

Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev am: 7606d4798b
authorJeff Sharkey <jsharkey@android.com>
Thu, 3 Aug 2017 01:35:10 +0000 (01:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 01:35:10 +0000 (01:35 +0000)
commit1004312c2c4d6bb0c4cc3a4bf949fa623e0bcbed
tree2feb6bade904f5d020cf73f564614f016a9d6a86
parentb9ad0772f681e2ca6b6db8463cd0f8ef52431e09
parent9fb2386b27c07053894692e9b35af23ed7385511
Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev am: 7606d4798b
am: 9fb2386b27

Change-Id: Ibb66f14f6f172fac57ea9070f2c8080f60daf0fe