Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp

Browse Source 
* commit 'bd5a3e6510e83b161a0e40c191d349524ae4a8e6':
  resolve conflicts for merge 5a7b3b65 correctly
This commit is contained in:
Deepanshu Gupta
2014-05-13 17:58:17 +00:00
committed by Android Git Automerger
parent 8bf73eae6c bd5a3e6510
commit 70efbad064
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
View File

@@ -89,7 +89,7 @@ public class Main {
try { try {
CreateInfo info = new CreateInfo(); CreateInfo info = new CreateInfo();
Set<String> excludeClasses = getExcludedClasses(info); Set<String> excludeClasses = getExcludedClasses(info);
AsmGenerator agen = new AsmGenerator(log, osDestJar[0], info); AsmGenerator agen = new AsmGenerator(log, osDestJar, info);
AsmAnalyzer aa = new AsmAnalyzer(log, osJarPath, agen, AsmAnalyzer aa = new AsmAnalyzer(log, osJarPath, agen,
new String[] { // derived from new String[] { // derived from