| commit | 3fedec19e6efc22755b1e2e4bed67615d2acb9c2 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 21:21:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 21:21:30 2014 +0000 |
| tree | f2cec723d1d2ebf0a9e5b3cf02ba2a29685b19be | |
| parent | 6eff9e54ebcc9d416ba008a0106708240f3abf9b [diff] | |
| parent | 2e78de7f37fd2fb8666e31a610aeb0efba5ad626 [diff] |
am 2e78de7f: 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 '2e78de7f37fd2fb8666e31a610aeb0efba5ad626': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]