| commit | e2edd753e8a58de5958b5145f9ea7d2f5484a6ca | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 20:58:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 20:58:41 2014 +0000 |
| tree | d2dbc04ad47eba5f0c227bc64e889d25bf23c92b | |
| parent | 4dcb4a1f03abb2a4d3f1ceb9aed0feb6264ebfb5 [diff] | |
| parent | 76364c6970f86bdf67622c14c9f1ebac6883998b [diff] |
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 '76364c6970f86bdf67622c14c9f1ebac6883998b': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]