Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Mon, 3 Apr 2017 22:13:26 +0000 (22:13 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 3 Apr 2017 22:13:34 +0000 (22:13 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 3 Apr 2017 22:13:26 +0000 (22:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 3 Apr 2017 22:13:34 +0000 (22:13 +0000)
diff --cc services/core/java/com/android/server/pm/ShortcutService.java
Simple merge
diff --cc services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
Simple merge
diff --cc services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 3 Apr 2017 22:13:26 +0000 (22:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 3 Apr 2017 22:13:34 +0000 (22:13 +0000)
		1	2
services/core/java/com/android/server/pm/ShortcutService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java	patch \|	diff1 \|	diff2 \|	blob \| history