Commits

Deepanshu Gupta authored f1e7187645f
Fix theme/style resolution in Layoutlib [DO NOT MERGE] Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d (cherry picked from commit bfec73c2db5a34ced248213edf5519c80727a65f) Conflicts: core/java/android/content/res/Resources.java tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java