| commit | 47da909503dace6ecae400301654ca1499aeef1e | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 20:36:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 20:36:40 2014 +0000 |
| tree | 1a5307405396a8dc02ba22a3b487dbb45454c15c | |
| parent | 919902a0de62d4cddc5a2861ddeb56753565b4fa [diff] | |
| parent | 4f69d5b8e976751e9dd0ff2c8bf1b385f06435c4 [diff] |
am 4f69d5b8: (-s ours) am 8af310c0: am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] * commit '4f69d5b8e976751e9dd0ff2c8bf1b385f06435c4': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]