Jean-Baptiste Queru f389f2820c resolved conflicts for merge of 7749a1c5 to jb-mr1-dev ...

Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97

2012-09-05 12:21:50 -07:00

..

assets

…

res

resolved conflicts for merge of 7749a1c5 to jb-mr1-dev

2012-09-05 12:21:50 -07:00

Android.mk

…

AndroidManifest.xml

Notify verifiers that verification is complete

2012-08-30 16:00:59 -07:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…