Android U QPR2 Beta 2 GPL
Merge "Migrate JDiff to new Javadoc"