Merge "Resolve inflate attr against default package" into oc-dev

am: bd8fb0e71d

Change-Id: I8dbd50f99267fd86c8bde51a9428cb47bf701b21

core/java/android/view/LayoutInflater.java

@@ -923,8 +923,11 @@ public abstract class LayoutInflater {
                             + " include tag: <include layout=\"@layout/layoutID\" />");
                 }
 
-                // Attempt to resolve the "?attr/name" string to an identifier.
-                layout = context.getResources().getIdentifier(value.substring(1), null, null);
+                // Attempt to resolve the "?attr/name" string to an attribute
+                // within the default (e.g. application) package.
+                layout = context.getResources().getIdentifier(
+                        value.substring(1), "attr", context.getPackageName());
+
             }
 
             // The layout might be referencing a theme attribute.