Nick Kralevich a170bb81d5 Remove duplicate AndroidManifest.xml entries. ...

The automerger added the entries twice...

Change-Id: I7910cb2126b339b0c8aee11051db1a2de8ae26ae

2012-12-05 16:11:42 -08:00

..

assets

…

res

am 994901ee: am d9e46ac5: am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev

2012-12-04 11:09:25 -08:00

Android.mk

…

AndroidManifest.xml

Remove duplicate AndroidManifest.xml entries.

2012-12-05 16:11:42 -08:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…