summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorHui Shu <hush@google.com>2015-01-05 22:21:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-05 22:21:51 +0000
commit58958678010910a3e8eca6ef574e2dd7f12aec42 (patch)
treef13fd5b4f28fca6ae312b38084668dfb00c9c0b4 /cmds
parent62fbd4feb1bccfdfa08a96c71eb5a1b102ac4c2c (diff)
parent9bd1382f210732f406e497883dc8f4039f8d33d9 (diff)
downloadframeworks_base-58958678010910a3e8eca6ef574e2dd7f12aec42.zip
frameworks_base-58958678010910a3e8eca6ef574e2dd7f12aec42.tar.gz
frameworks_base-58958678010910a3e8eca6ef574e2dd7f12aec42.tar.bz2
am e5cb6a25: am bb845152: Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev
automerge: 9bd1382 * commit '9bd1382f210732f406e497883dc8f4039f8d33d9': pm path needs to return 0 when it succeeds.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/pm/src/com/android/commands/pm/Pm.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java
index dfe1fce..7a01701 100644
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -1670,8 +1670,8 @@ public final class Pm {
System.out.print("package:");
System.out.println(splitSourceDir);
}
- return 0;
}
+ return 0;
}
} catch (RemoteException e) {
System.err.println(e.toString());