tree fb455b93cd6f2e9fd9d14825de1c5d9fd246ed4e
parent 8c7d7133d55c755eff45566d1b2ee074300d6d64
parent 0bf1d6a0ed6c10719f9390cbed31c64142c41ccf
author Wenhui Yao <wenhui@zoodles.com> 1344289010 -0700
committer Wenhui Yao <wenhui@zoodles.com> 1344289010 -0700

Merge branch 'master' of git://github.com/pivotal/robolectric into robo-staging