Diego Perez b9935889b1 resolved conflicts for merge of 112d8a36 to mnc-dev ...

Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2

2015-07-21 15:32:55 +01:00

..

.settings

…

resources

Fix nav bar spacing for tablets.

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

src

resolved conflicts for merge of 112d8a36 to mnc-dev

2015-07-21 15:32:55 +01:00

tests

resolved conflicts for merge of 112d8a36 to mnc-dev

2015-07-21 15:32:55 +01: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

Update intellij project for tools-common sources.

2015-07-07 12:24:47 -07:00

update_nav_icons.sh

Update nav bar icons.

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