resolve merge conflicts of 4038f15 to master

Change-Id: Ifae7060ab23ad7619a5fdd01315a2d3e7c8a3845
2016-03-30 12:58:09 -04:00
parent 36b12b7e63 4038f15af3
commit 6e20cd86b2
5 changed files with 17 additions and 8 deletions
--- a/src/com/android/settings/InstrumentedFragment.java
+++ b/src/com/android/settings/InstrumentedFragment.java
@@ -29,6 +29,8 @@ public abstract class InstrumentedFragment extends PreferenceFragment {
    public static final int UNDECLARED = 100000;

    public static final int DASHBOARD_CONTAINER = UNDECLARED + 1;
+    // Used by PreferenceActivity for the dummy fragment it adds, no useful data here.
+    public static final int PREFERENCE_ACTIVITY_FRAGMENT = UNDECLARED + 2;

    /**
     * Declare the view of this category.