Jeff Brown b437a79b05 resolved conflicts for merge of 21dffd5d to master ...

Change-Id: I37c48dee471c9d43f19c1fe4a01f70db53e2441f

2013-04-08 19:05:15 -07:00

..

.settings

Make Layoutlib compile on Java 6.

2012-02-02 17:45:45 -08:00

resources/bars

Update layoutlib for jb mr1.

2012-10-17 17:15:31 -07:00

src

resolved conflicts for merge of 21dffd5d to master

2013-04-08 19:05:15 -07:00

tests

Fix classpath of eclipse projects for layoutlib.

2012-05-08 16:18:32 -07:00

.classpath

Fix classpath of eclipse projects for layoutlib.

2012-05-08 16:18:32 -07:00

.project

…

Android.mk

…