am 90982936: am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb

* commit '90982936a026f1f951fe06ad4d2bcfd72a99ab8f':
  Revert "Video editor CTS: Framework modifications"
tree: 33fe9c9c584ec0aec3aa4d1afa05b0bbbbdbec3f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE