| commit | 5f664a1119f9008feeb924ec50c2ac896a8550db | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 21:06:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 21:06:02 2014 +0000 |
| tree | 4c5319449b4baca19cfaa9ac598b49b43252c072 | |
| parent | b97ac2b6acc84b02ebe16a8c875bae5cfd0898f2 [diff] | |
| parent | 2a57694d0ae30eeca7239c7efae4e6bf478b781a [diff] |
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 '2a57694d0ae30eeca7239c7efae4e6bf478b781a': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]