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