tree ee9339e65a33d73362c796fbf911ef66e0554a6b
parent 33040bdd7715a46bfcfe3cc5f894972ef65d31be
parent 121fbd81d2a372786df3840e35abf6b897c977e5
author Christian Williams <antixian666@gmail.com> 1290191972 -0800
committer Christian Williams <antixian666@gmail.com> 1290191972 -0800

Merge branch 'master' of https://github.com/mportuesisf/robolectric into mportuesisf-master

Conflicts:
	src/com/xtremelabs/robolectric/Robolectric.java
	src/com/xtremelabs/robolectric/shadows/ShadowApplication.java
	src/com/xtremelabs/robolectric/shadows/ShadowIntent.java
	src/com/xtremelabs/robolectric/shadows/ShadowPreferenceManager.java
	src/com/xtremelabs/robolectric/view/TestWindowManager.java
	test/com/xtremelabs/robolectric/shadows/DisplayTest.java
	test/com/xtremelabs/robolectric/shadows/PreferenceManagerTest.java