| commit | d056218b0486676f8e3b68854f94e2d36209ea18 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 20:30:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 20:30:57 2014 +0000 |
| tree | 4c5319449b4baca19cfaa9ac598b49b43252c072 | |
| parent | 8974a5e6d8408b4cd93f1befb05cc9b654b71e4a [diff] | |
| parent | 661e158b0a754f1123485673ac050e388e8056a2 [diff] |
am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] * commit '661e158b0a754f1123485673ac050e388e8056a2': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]