| commit | 01041ec00e671b5d52880ded067f044136470c0c | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 20:39:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 20:39:09 2014 +0000 |
| tree | 335bebc74fdd3ed0fd4b1be54b747ab389076327 | |
| parent | 8af310c0c6a0922d2a84600f9abf7877009d12ba [diff] | |
| parent | 7e0b1d59010ad69372575e5d87dc6b6f2c9486da [diff] |
am 7e0b1d59: am d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] * commit '7e0b1d59010ad69372575e5d87dc6b6f2c9486da': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]