commit d6b5de96c20b506fde72e1f9cd1e16965a4625ec
author Jeff Sharkey <jsharkey@android.com> Fri Feb 15 10:46:35 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Feb 15 10:46:35 2019 -0800
tree d60b04b2ac5ce2f4f31ab2ba50d6cc9309fae3cb
parent 122d78ddac5c749c4ec7f417db81ab792892c3af
parent 2144164526d4f82adcc9cd5a0377d85bed9981aa

Merge "No-op flag to keep tests working in this branch."
am: 2144164526

Change-Id: I7723ff61f7c0f6f5f0bf560b2baa16ffda85dffb

cmds/am/src/com/android/commands/am/Am.java

diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java
index c04e61b..ca4a184 100644
--- a/cmds/am/src/com/android/commands/am/Am.java
+++ b/cmds/am/src/com/android/commands/am/Am.java
@@ -174,6 +174,8 @@
                 instrument.noWindowAnimation = true;
             } else if (opt.equals("--no-hidden-api-checks")) {
                 instrument.disableHiddenApiChecks = true;
+            } else if (opt.equals("--no-isolated-storage")) {
+                // NOTE: currently a no-op in this branch
             } else if (opt.equals("--user")) {
                 instrument.userId = parseUserArg(nextArgRequired());
             } else if (opt.equals("--abi")) {