am 70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit '70f2201c7ab842df6c45a1540803239eafa267ed':
  Move to dalvik.vm.lib.2 to force default to libart
This commit is contained in:
Brian Carlstrom
2014-05-28 22:31:43 +00:00
committed by Android Git Automerger

View File

@@ -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";