am 390490e4: (-s ours) am ad7bce4c: Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread

Merge commit '390490e4ae768d541018038c782c52b471bb61de'

* commit '390490e4ae768d541018038c782c52b471bb61de':
  DO NOT MERGE - Doclava warnings are now errors.
tree: 488db13a095c1b8af7bc6468dc98376c1bcdf75c
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE