commit 2cbc51f5ac5d726c5306e9af8bc2f82f87b75189
author Narayan Kamath <narayan@google.com> Tue Jun 03 14:11:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 03 14:11:55 2014 +0000
tree c9f934a927907f5a3711d3b88e8b89c97d68450f
parent c32a244e907719e03d0fae42b20401dcd2c595fc
parent 00e3c58d0232952bdcafd02f71e6c9fb00b4d248

am 00e3c58d: am 73f7cd98: Merge "Fix build."

* commit '00e3c58d0232952bdcafd02f71e6c9fb00b4d248':
  Fix build.

packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java

diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
index e4de641..ec87c6e 100644
--- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
+++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
@@ -345,7 +345,7 @@
         NativeLibraryHelper.ApkHandle handle = new NativeLibraryHelper.ApkHandle(codePath);
         String[] abiList = Build.SUPPORTED_ABIS;
         if (abiOverride != null) {
-            abiList = new String[] { abiList };
+            abiList = new String[] { abiOverride };
         } else {
             try {
                 if (Build.SUPPORTED_64_BIT_ABIS.length > 0 &&