am a85c4f16: am d5d13286: Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread

Merge commit 'a85c4f165137ab360879bd9129259690ab6ac05d'

* commit 'a85c4f165137ab360879bd9129259690ab6ac05d':
  This was marked @Deprecated in the docs, but it was misspelled.
tree: 488db13a095c1b8af7bc6468dc98376c1bcdf75c
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE