update wrong TestLevel values
update tests that were still using the old annotations
minor fixes to eliminate eclipse warnings
style fixes
Original author: sus
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143326
update wrong TestLevel values
update tests that were still using the old annotations
minor fixes to eliminate eclipse warnings
style fixes
Original author: sus
Merged from: //branches/cupcake/...
Automated import of CL 143176