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