am 89ccc962: am 9cf39372: am 94c441a4: am cdaee868: Merge "Preserve a class for testing"

* commit '89ccc962e507d574f0603391b9bc994309632b19':
This commit is contained in:
Kurt Partridge 2013-04-17 19:49:15 -07:00 committed by Android Git Automerger
commit fb4da9692b

Diff content is not available