Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev

author Makoto Onuki <omakoto@google.com>

Thu, 16 Jun 2016 17:05:54 +0000 (17:05 +0000)

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

Thu, 16 Jun 2016 17:05:55 +0000 (17:05 +0000)
author Makoto Onuki <omakoto@google.com>
Thu, 16 Jun 2016 17:05:54 +0000 (17:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 16 Jun 2016 17:05:55 +0000 (17:05 +0000)
diff --cc services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
Simple merge
diff --cc services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
Simple merge
author	Makoto Onuki <omakoto@google.com>
	Thu, 16 Jun 2016 17:05:54 +0000 (17:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 16 Jun 2016 17:05:55 +0000 (17:05 +0000)
		1	2
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java	patch \|	diff1 \|	diff2 \|	blob \| history