Shawn Pearce 118ac5dd4f Merge branch 'stable-2.7' ... * stable-2.7: Prevent expansion when whole file isn't loaded Generate javadoc for gerrit extension and plugin API Conflicts: gerrit-extension-api/pom.xml gerrit-plugin-api/pom.xml pom.xml tools/deploy_api.sh Change-Id: I8a7d57fe00568713f1dbe8c0fe387e2052c22213		2013-10-07 14:52:33 -07:00
..
main	Merge branch 'stable-2.7'	2013-10-07 14:52:33 -07:00
test	Fix bad imports in Index, LineMapperTest, EditIderatorTest	2013-08-22 10:57:33 -07:00