am 6ee8c8a8: am dfeaab74: Merge "Call local finish(String) on cancel"
* commit '6ee8c8a8cb2391241985b9c61a86271f00a3d9ce':
Call local finish(String) on cancel
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 3859f05..23aa1a1 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -127,7 +127,7 @@
case UNLOCK_CANCELED:
// User wanted to cancel the request, so exit.
mState = State.INITIAL;
- finish();
+ finish(null);
return;
default:
throw new AssertionError();