Merge "Manifest Merger tool."

2 files changed, 8 insertions, 1 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/util/CommandLineParser.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/util/CommandLineParser.java
index 1fa69b2..3b4c682 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/util/CommandLineParser.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/util/CommandLineParser.java
@@ -712,7 +712,7 @@ public class CommandLineParser {
             }
         },
 
-        /** Argument value is a String Array. Default value is a null. */
+        /** Argument value is a {@link List}<String>. Default value is an empty list. */
         STRING_ARRAY {
             @Override
             public boolean needsExtra() {
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java
index 937a648..24b120f 100644
--- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java
+++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java
@@ -16,10 +16,12 @@
 
 package com.android.sdklib.mock;
 
+import com.android.annotations.NonNull;
 import com.android.sdklib.ISdkLog;
 
 import java.util.ArrayList;
 import java.util.Formatter;
+import java.util.List;
 
 /**
  * An instance of {@link ISdkLog} that captures all messages to an internal list.
@@ -56,6 +58,11 @@ public class MockLog implements ISdkLog {
         return mMessages.toString();
     }
 
+    @NonNull
+    public List<String> getMessages() {
+        return mMessages;
+    }
+
     public void clear() {
         mMessages.clear();
     }