Diego Perez 8df6d037be resolved conflicts for merge of 5a53816b to mnc-dev ...

Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f

2015-06-15 16:17:08 +01:00

..

.settings

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00

resources

Fix nav bar spacing for tablets.

2015-05-18 11:58:31 -07:00

src

resolved conflicts for merge of 5a53816b to mnc-dev

2015-06-15 16:17:08 +01:00

tests

LayoutLib: Support getting resource arrays.

2015-05-26 16:33:10 +00:00

.classpath

Add testing framework to LayoutLib. [DO NOT MERGE]

2014-10-01 12:43:11 -07:00

.project

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00

Android.mk

Add missing delegates for M preview.

2015-05-13 18:15:20 -07:00

bridge.iml

Move couple of intellij libraries to project level.

2015-05-14 15:12:57 -07:00

update_nav_icons.sh

Update nav bar icons.

2015-05-13 20:48:58 -07:00