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.