| commit | 273f0d54f58c5be9d9fc7d0e2612cb8d3c01b802 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Mon Nov 17 06:12:58 2014 -0800 |
| committer | The Android Automerger <android-build@google.com> | Mon Nov 17 06:12:58 2014 -0800 |
| tree | 212046cfb90dbba8529d00d2bf64145138a6f899 | |
| parent | 137cd8d87d62a612a33cae0d8e2b8c440dccaee0 [diff] | |
| parent | 8a5fa15b4cf29a22325602bf31f32aa3e266965e [diff] |
merge in lmp-mr1-release history after reset to lmp-mr1-dev
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();