| commit | f1e7187645f0b0388f7b97d742395efd228b347a | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Mar 11 18:02:44 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue Apr 15 20:03:19 2014 -0700 |
| tree | 1745ee38a0db1dad4b2f4d45378c56c8a13de779 | |
| parent | 1b87390c9426c4bc9119829e9375d712dfde11c3 [diff] |
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