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

..

java

am 368ee53f: am f663cad2: am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev

2012-12-05 13:00:41 -08:00

jni

Merge "new can't fail on Android"

2012-12-04 16:37:49 -08:00

res

Remove duplicate AndroidManifest.xml entries.

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

tests

am 9f43afad: am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev

2012-11-16 10:37:54 -08:00