| commit | e81cafe1130c2a95340beec5476c5bf258604fe3 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 20:50:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 20:50:33 2014 +0000 |
| tree | bf6f13aa63d8518ae6ade676ec535127d61a2a1c | |
| parent | 8ee244355bdba6773e3647f0f283995fefb10c3a [diff] | |
| parent | 896bdbea56b5a5b7dfe82c559dd11437bff5adf5 [diff] |
am 896bdbea: (-s ours) am 01041ec0: am 7e0b1d59: am d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] * commit '896bdbea56b5a5b7dfe82c559dd11437bff5adf5': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]