Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / PreferencesActivity.java

diff --git a/android/src/net/sf/openrocket/android/PreferencesActivity.java b/android/src/net/sf/openrocket/android/PreferencesActivity.java
index 5aa544ad71f0a9d2a800634c4ef15884e9b933c2..c6e6eee327b74f9831fbc4adb9a57d91cc5cadb6 100644 (file)
--- a/android/src/net/sf/openrocket/android/PreferencesActivity.java
+++ b/android/src/net/sf/openrocket/android/PreferencesActivity.java
@@ -8,7 +8,9 @@ import android.os.Bundle;
 import android.preference.Preference;\r
 import android.preference.PreferenceManager;\r
 \r
-public class PreferencesActivity extends android.preference.PreferenceActivity \r
+import com.actionbarsherlock.app.SherlockPreferenceActivity;\r
+\r
+public class PreferencesActivity extends SherlockPreferenceActivity \r
 {\r
 \r
        \r