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

* commit '9cf3937281092c45efd14c9f4cadadd60ba8e245':
main
Kurt Partridge 2013-04-17 19:43:54 -07:00 committed by Android Git Automerger
commit 89ccc962e5

Diff Content Not Available