Jean-Baptiste Queru 12902d687f resolved conflicts for merge of 78742e01 to stage-korg-master ...

Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905

2010-12-07 12:51:49 -08:00

..

assets

DO NOT MERGE. Add assets for <select>

2010-10-29 17:08:35 -04:00

res

resolved conflicts for merge of 78742e01 to stage-korg-master

2010-12-07 12:51:49 -08:00

Android.mk

Do not use a user tag on apps, as it is ignored.

2010-01-06 08:53:44 -08:00

AndroidManifest.xml

Hide some NFC API's.

2010-10-28 14:54:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…