| commit | 728e72df9ded3ad4b007b0c615aec6d03ab0b789 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 20:54:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 20:54:31 2014 +0000 |
| tree | 335bebc74fdd3ed0fd4b1be54b747ab389076327 | |
| parent | 46a156a6d0c54506d835d350b97dd855b7821729 [diff] | |
| parent | 2bc3df2e3cd8e27609ca4c9f2aa1c1f3304d199d [diff] |
am 2bc3df2e: am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] * commit '2bc3df2e3cd8e27609ca4c9f2aa1c1f3304d199d': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]