Merge \\"Remove dead code that could have a memory leak\\" into nyc-mr1-dev am: d1e94a10eb

am: 19aa60b67a

Change-Id: I47bd9f8f15f89c96af4ac6c67a193abc331f2e60

src/com/android/settings/search/Index.java

@@ -1165,17 +1165,6 @@ public class Index {
         return result.toString();
     }
 
-    private int getResId(Context context, AttributeSet set, int[] attrs, int resId) {
-        final TypedArray sa = context.obtainStyledAttributes(set, attrs);
-        final TypedValue tv = sa.peekValue(resId);
-
-        if (tv != null && tv.type == TypedValue.TYPE_STRING) {
-            return tv.resourceId;
-        } else {
-            return 0;
-        }
-   }
-
     /**
      * A private class for updating the Index database
      */