| commit | af7649bc006e9be5b0781f080dd3fc1a9deab2dd | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 21:00:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 21:00:52 2014 +0000 |
| tree | bf6f13aa63d8518ae6ade676ec535127d61a2a1c | |
| parent | ae7bee94e895950dd54b9e1e0365a67059205781 [diff] | |
| parent | 6eff9e54ebcc9d416ba008a0106708240f3abf9b [diff] |
am 6eff9e54: (-s ours) am 728e72df: am 2bc3df2e: am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] * commit '6eff9e54ebcc9d416ba008a0106708240f3abf9b': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]