am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread

Merge commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8' into gingerbread-plus-aosp

* commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8':
  Allow application to set two more encoding paramters: video profile and level
tree: c3155828f6d2aaf434542df235aa342648b40a7d
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE