dd
d
dMerge branch 'master' of github.com:cafefinder/facebook-android-sdk

Conflicts:
	facebook/TestApp/AndroidManifest.xml
	facebook/TestApp/SdkTestApp.eml
	facebook/TestApp/SdkTestApp.iml
	facebook/TestApp/ant.properties
	facebook/TestApp/build.xml
	facebook/TestApp/proguard-project.txt
	facebook/TestApp/project.properties
	facebook/TestApp/res/layout/main.xml
	facebook/TestApp/res/values/strings.xml
	facebook/TestApp/src/com/facebook/sdk/StatusActivity.java
	facebook/tests/.classpath
	facebook/tests/.project
	facebook/tests/AndroidManifest.xml
	facebook/tests/SdkTests.eml
	facebook/tests/SdkTests.iml
	facebook/tests/ant.properties
	facebook/tests/build.xml
	facebook/tests/proguard-project.txt
	facebook/tests/project.properties
	facebook/tests/res/layout/friend_picker_test_layout_1.xml
	facebook/tests/res/layout/place_picker_test_layout_1.xml
	facebook/tests/res/values/strings.xml
	facebook/tests/src/com/facebook/AccessTokenTests.java
	facebook/tests/src/com/facebook/AppEventsLoggerTests.java
	facebook/tests/src/com/facebook/AsyncRequestTests.java
	facebook/tests/src/com/facebook/AuthorizationClientTests.java
	facebook/tests/src/com/facebook/BatchRequestTests.java
	facebook/tests/src/com/facebook/FacebookActivityTestCase.java
	facebook/tests/src/com/facebook/FacebookActivityTests.java
	facebook/tests/src/com/facebook/FacebookRequestErrorTests.java
	facebook/tests/src/com/facebook/FacebookTestCase.java
	facebook/tests/src/com/facebook/GraphRequestTests.java
	facebook/tests/src/com/facebook/NativeAppCallAttachmentStoreTest.java
	facebook/tests/src/com/facebook/NativeAppCallContentProviderTest.java
	facebook/tests/src/com/facebook/RequestTests.java
	facebook/tests/src/com/facebook/SessionTests.java
	facebook/tests/src/com/facebook/SessionTestsBase.java
	facebook/tests/src/com/facebook/SettingsTests.java
	facebook/tests/src/com/facebook/SharedPreferencesTokenCacheTests.java
	facebook/tests/src/com/facebook/TestBlocker.java
	facebook/tests/src/com/facebook/TestSessionTests.java
	facebook/tests/src/com/facebook/TestUtils.java
	facebook/tests/src/com/facebook/WaitForBroadcastReceiver.java
	facebook/tests/src/com/facebook/internal/FileLruCacheTests.java
	facebook/tests/src/com/facebook/internal/ImageResponseCacheTests.java
	facebook/tests/src/com/facebook/internal/SessionTrackerTests.java
	facebook/tests/src/com/facebook/internal/ValidateTests.java
	facebook/tests/src/com/facebook/internal/WorkQueueTests.java
	facebook/tests/src/com/facebook/model/GraphObjectFactoryTests.java
	facebook/tests/src/com/facebook/model/JsonUtilTests.java
	facebook/tests/src/com/facebook/model/OpenGraphActionTests.java
	facebook/tests/src/com/facebook/model/OpenGraphObjectTests.java
	facebook/tests/src/com/facebook/widget/FacebookDialogTests.java
	facebook/tests/src/com/facebook/widget/FragmentTestCase.java
	facebook/tests/src/com/facebook/widget/FriendPickerFragmentTests.java
	facebook/tests/src/com/facebook/widget/GraphObjectPagingLoaderTests.java
	facebook/tests/src/com/facebook/widget/LoginButtonTest.java
	facebook/tests/src/com/facebook/widget/PlacePickerFragmentTests.java
	facebook/tests/src/com/facebook/widget/UserSettingsFragmentTests.java