Jeff Brown 767225d820 resolved conflicts for merge of d9ee01a9 to kraken ...

Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d

2010-03-30 23:49:17 -07:00

..

assets

http://b/issue?id=2516676

2010-03-25 14:19:06 +00:00

res

resolved conflicts for merge of d9ee01a9 to kraken

2010-03-30 23:49:17 -07: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

Use a secure setting for default browser geolocation permissions

2010-03-25 14:04:45 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…