Wink Saville 41b564f354 resolved conflicts for merge of e8b57fea to master ...

Change-Id: I2ccf2b4cb73faadd0c8608cc21dda5db888d2937

2012-02-10 16:11:18 -08:00

..

assets

…

res

resolved conflicts for merge of e8b57fea to master

2012-02-10 16:11:18 -08:00

Android.mk

…

AndroidManifest.xml

New Serial Manager API:

2012-02-10 10:51:19 -08:00

lint.xml

Add some lint control for the frameworks.

2012-02-03 13:27:52 -08:00

MakeJavaSymbols.sed

Only generate private symbols that are needed.

2012-02-07 12:57:50 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…