am 73f7cd98: Merge "Fix build."

* commit '73f7cd98d61eded2cc3af0f672937c7a2ec5c10a':
  Fix build.
This commit is contained in:
Narayan Kamath
2014-06-03 14:08:51 +00:00
committed by Android Git Automerger

View File

@@ -345,7 +345,7 @@ public class DefaultContainerService extends IntentService {
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 &&