am b04ec6a8: (-s ours) am 7a7ed2b2: Merge "Do not check features in...
am b04ec6a8: (-s ours) am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
* commit 'b04ec6a8':
Do not check features in PackageManagerService DO NOT MERGE