Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev

author Makoto Onuki <omakoto@google.com>

Tue, 17 May 2016 18:01:26 +0000 (18:01 +0000)

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

Tue, 17 May 2016 18:01:29 +0000 (18:01 +0000)
author Makoto Onuki <omakoto@google.com>
Tue, 17 May 2016 18:01:26 +0000 (18:01 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 17 May 2016 18:01:29 +0000 (18:01 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Makoto Onuki <omakoto@google.com>
	Tue, 17 May 2016 18:01:26 +0000 (18:01 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 17 May 2016 18:01:29 +0000 (18:01 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history