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
tree: 957967ca93cd09aaa03a41ad7719f195496065a4
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE