Dianne Hackborn 4bb6b751fb Revert "resolved conflicts for merge of 47249f2a to mnc-dev" ...

This reverts commit c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing
changes made to 8562b08f04c1309cf40db1e749d612b6824f1d12.

2015-05-22 16:34:44 -07:00

..

.settings

…

resources

Fix nav bar spacing for tablets.

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

src

Revert "resolved conflicts for merge of 47249f2a to mnc-dev"

2015-05-22 16:34:44 -07:00

tests

Update platformDir search in tests.

2015-05-20 11:28:50 -07:00

.classpath

Add testing framework to LayoutLib. [DO NOT MERGE]

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

.project

…

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