am 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread

Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24'

* commit '099aa9a1b4eaf6536decbcafac43476c4908ef24':
  add a fps counter to sanangeles demo
tree: 4cfd9282d64381824c5a94eae093595468bff55a
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE