Deepanshu Gupta 8782a12005 resolved conflicts for merge of 61fb5784 to jb-mr1-dev ...

Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d

2014-06-04 12:43:01 -07:00

..

.settings

Make Layoutlib compile on Java 6.

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

resources/bars

am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

2014-05-13 17:11:20 +00:00

src

resolved conflicts for merge of 61fb5784 to jb-mr1-dev

2014-06-04 12:43:01 -07:00

tests

am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

2014-05-13 02:20:13 +00:00

.classpath

Fix classpath of eclipse projects for layoutlib.

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

.project

…

Android.mk

…