| commit | 95e384e8d45afeeafe47f54258522b1b67b01dca | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Feb 24 20:32:13 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 24 20:32:13 2011 -0800 |
| tree | e4807b14fa45433586e841c71e95d3901fe5c2b4 | |
| parent | 1b1b7c64784ee6c4756c9012d3d4ad74d44f768e [diff] | |
| parent | b052ecaa7e6ce40cec43efe5353b4bb12079aa55 [diff] |
am b052ecaa: resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp * commit 'b052ecaa7e6ce40cec43efe5353b4bb12079aa55': LayoutLib: Original import of Honeycomb's layoutlib. do not merge.