summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-05-28 23:13:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-28 23:13:26 +0000
commitf354290901284fdf147e200c814d34207927d04e (patch)
tree12b1cc29318e5a5838d1706a19a292ccfb03b64f
parenta8e1e7c9d08b0ccca7ccce7d5462fc2cdaaa3315 (diff)
parent2ce0dcdad47e132dbe0f9cd16146b8e3c6b11cd6 (diff)
downloadpackages_apps_Settings-f354290901284fdf147e200c814d34207927d04e.zip
packages_apps_Settings-f354290901284fdf147e200c814d34207927d04e.tar.gz
packages_apps_Settings-f354290901284fdf147e200c814d34207927d04e.tar.bz2
am 2ce0dcda: am 70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '2ce0dcdad47e132dbe0f9cd16146b8e3c6b11cd6': Move to dalvik.vm.lib.2 to force default to libart
-rw-r--r--src/com/android/settings/DevelopmentSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index d971bd2..229f169 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -94,7 +94,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private static final String KEEP_SCREEN_ON = "keep_screen_on";
private static final String BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";
private static final String SELECT_RUNTIME_KEY = "select_runtime";
- private static final String SELECT_RUNTIME_PROPERTY = "persist.sys.dalvik.vm.lib.1";
+ private static final String SELECT_RUNTIME_PROPERTY = "persist.sys.dalvik.vm.lib.2";
private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
private static final String HDCP_CHECKING_KEY = "hdcp_checking";
private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";