am 89b4cb1e: am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread

Merge commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea'

* commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea':
  Undo API patch due to field pulled up to superclass.
tree: 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE