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

* commit 'e1f7c7dd19474f72154b0447a2be9146b1692a02':
main
Jean Chalard 2013-04-17 19:55:28 -07:00 committed by Android Git Automerger
commit 3a1396aa3b

Diff Content Not Available