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

* commit 'b04ec6a8a7e6a684eb4b8d434c87b76bbac9c80c':
  Do not check features in PackageManagerService DO NOT MERGE