diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-28 16:10:53 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-28 16:10:53 -0700 |
| commit | 77b170cedca2828d8c40ca33b820f5911a558326 (patch) | |
| tree | a3c525c0bdd9c33756d6ff997730d1b3356dc5e0 /services/java/com/android | |
| parent | a487fb77dff1a86fbd160694de41e32b74f10cb1 (diff) | |
| parent | 452c592191a147ae1175db775bc3e7e8e0311855 (diff) | |
| download | frameworks_base-77b170cedca2828d8c40ca33b820f5911a558326.zip frameworks_base-77b170cedca2828d8c40ca33b820f5911a558326.tar.gz frameworks_base-77b170cedca2828d8c40ca33b820f5911a558326.tar.bz2 | |
resolved conflicts for merge of 452c5921 to klp-modular-dev-plus-aosp
Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index a5011af..bc8c115 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -168,7 +168,7 @@ public final class SystemServer { // had to fallback to a different runtime because it is // running as root and we need to be the system user to set // the property. http://b/11463182 - SystemProperties.set("persist.sys.dalvik.vm.lib.1", VMRuntime.getRuntime().vmLibrary()); + SystemProperties.set("persist.sys.dalvik.vm.lib.2", VMRuntime.getRuntime().vmLibrary()); // Enable the sampling profiler. if (SamplingProfilerIntegration.isEnabled()) { |