am 881fd799: Merge "Add application launch category." into ics-mr1

* commit '881fd799f1c54b934aa90310a54a145062264422':
  Add application launch category.
tree: a095c01de075b8bd69546064777e51080134b03d
  1. tests/
  2. AndroidManifest.xml