am b052ecaa: resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp

Browse Source

* commit 'b052ecaa7e6ce40cec43efe5353b4bb12079aa55':
  LayoutLib: Original import of Honeycomb's layoutlib. do not merge.

...

This commit is contained in:

Xavier Ducrohet

2011-02-24 20:32:13 -08:00

committed by Android Git Automerger

parent 1b1b7c6478 b052ecaa7e

commit 95e384e8d4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available