Merge "Formatting fix"

2011-10-04 13:03:38 -07:00
parent bbb7097a68 7caac4c19d
commit 2d53e1a5d2
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);
                }