| commit | 2e78de7f37fd2fb8666e31a610aeb0efba5ad626 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 21:17:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 21:17:09 2014 +0000 |
| tree | 335bebc74fdd3ed0fd4b1be54b747ab389076327 | |
| parent | 728e72df9ded3ad4b007b0c615aec6d03ab0b789 [diff] | |
| parent | 92641015c83ec027f0d06b8047804f5ffc2dc16b [diff] |
am 92641015: am 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] * commit '92641015c83ec027f0d06b8047804f5ffc2dc16b': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]