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

* commit '3a1396aa3bc570a4064f5b87f4285e223c7defbd':
main
Jean Chalard 2013-05-15 10:42:32 -07:00 committed by Android Git Automerger
commit 1b1168796f

Diff Content Not Available