Commits
Craig Mautner authored d2cc56ebb38M
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
Showing diff to80021878a84