From 2a8ac2e504d284ab2f4a30d0b84cc6c1f1857e94 Mon Sep 17 00:00:00 2001
From: Julian Dolby <dolby@us.ibm.com>
Date: Mon, 24 Nov 2014 17:56:41 -0500
Subject: [PATCH] merge

---
 .../source/org/scandroid/util/AndroidAnalysisContext.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java b/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java
index 06f209e31..0e0e8aa18 100644
--- a/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java
+++ b/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java
@@ -137,7 +137,7 @@ public class AndroidAnalysisContext {
 			       ClassHierarchyException, URISyntaxException {
 		logger.debug(DefaultSCanDroidOptions.dumpString(options));
 		this.options = options;
-		scope = AndroidAnalysisScope.setUpAndroidAnalysisScope(options.getAndroidLibrary(), options.getClasspath(), exclusions);
+		scope = AndroidAnalysisScope.setUpAndroidAnalysisScope(options.getClasspath(), exclusions, options.getAndroidLibrary());
 		
 		cha = ClassHierarchy.make(scope);