Craig Mautner d2cc56ebb3 resolved conflicts for merge of f8a58208 to master ...

Conflicts:
	core/java/android/content/pm/PackageParser.java
	core/res/res/values/attrs_manifest.xml
	core/res/res/values/public.xml

Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2

2014-04-24 10:27:37 -07:00

..

current.txt

resolved conflicts for merge of f8a58208 to master

2014-04-24 10:27:37 -07:00

removed.txt

Add removeApi commandline option for doclava and an empty removed.txt

2014-02-21 17:24:03 -08:00