commit ee5fbfaad7e37ea38ff22c3d04126f1f3bec6c2f
author Shreyas Narayan <shrena@codeaurora.org> Sun Mar 15 02:09:55 2015 +0530
committer Shreyas Narayan <shrena@codeaurora.org> Sun Mar 15 02:09:55 2015 +0530
tree 7435892ea946822818e48e9969a5ee3b0feaffe5
parent 250c621d61859fe9db6338a7b5c42bff5c3e2d92
parent 273f0d54f58c5be9d9fc7d0e2612cb8d3c01b802

Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Iab263a2df9a0a6b193bd3427f3b54fd1ff4e39c4

src/com/android/keychain/KeyChainActivity.java

diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 23aa1a1..73bb029 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -387,7 +387,6 @@
                         getIntent().getIBinderExtra(KeyChain.EXTRA_RESPONSE));
         if (keyChainAliasResponse != null) {
             new ResponseSender(keyChainAliasResponse, alias).execute();
-            return;
         }
         finish();
     }