resolve merge conflicts of e6431c7 to master

Change-Id: I9d3c5fd5c8b73add93894a21d2f17ed0ae442a32
2016-09-13 19:08:11 -07:00
parent 73f8eda988 e6431c79c7
commit 14e9535fc8
2 changed files with 5 additions and 3 deletions
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -174,11 +174,13 @@ public class BillingCycleSettings extends DataUsageBase implements
        private View mView;

        public static void show(DataUsageEditController parent, boolean isLimit) {
-            if (! (parent instanceof Fragment)) {
+            if (!(parent instanceof Fragment)) {
                return;
            }
            Fragment targetFragment = (Fragment) parent;
-            if (!targetFragment.isAdded()) return;
+            if (!targetFragment.isAdded()) {
+                return;
+            }

            final Bundle args = new Bundle();
            args.putParcelable(EXTRA_TEMPLATE, parent.getNetworkTemplate());