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