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

Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2

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

..

res

resolved conflicts for merge of 112d8a36 to mnc-dev

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

src

resolved conflicts for merge of 112d8a36 to mnc-dev

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

.classpath

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

2014-01-27 10:31:04 -08: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