am 2d53e1a5: Merge "Formatting fix"

* commit '2d53e1a5d27e27e7d83474c9cd9e3f5c4ed49a91': Formatting fix
2011-10-04 13:06:36 -07:00
parent 649b34b0cf 2d53e1a5d2
commit 542d00c0ba
1 changed files with 2 additions and 4 deletions
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -325,8 +325,7 @@ public class ChooseLockGeneric extends PreferenceActivity {
                if(isFallback) {
                    startActivityForResult(intent, FALLBACK_REQUEST);
                    return;
-                }
-                else {
+                } else {
                    intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
                    startActivity(intent);
                }
@@ -343,8 +342,7 @@ public class ChooseLockGeneric extends PreferenceActivity {
                if(isFallback) {
                    startActivityForResult(intent, FALLBACK_REQUEST);
                    return;
-                }
-                else {
+                } else {
                    intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
                    startActivity(intent);
                }