am 506d724c: Merge "DO NOT MERGE.  I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread

Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp

* commit '506d724cc356a7ba73995ef2929c65062277c83d':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
tree: 3a3e8b93d010e337d289c228cd6109a2ba412d93
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE