am d244574b: am fd959fd1: am 1903b41f: Merge "Clean up tests and increase speed"

* commit 'd244574be84119505d3712559b743c67a783103c':
main
Jean Chalard 2013-04-17 19:51:00 -07:00 committed by Android Git Automerger
commit e1f7c7dd19

Diff Content Not Available