organize imports
convert to Diamond
fix imports
sync with openjdk9
revert use of java 7 language features
fix compile error
Update Creative Commons license URL in legal notices
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.