Merge "TIF: Allow the application to indicate a TV program to record" into nyc-dev

author Jae Seo <jaeseo@google.com>

Tue, 9 Feb 2016 02:14:11 +0000 (02:14 +0000)

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

Tue, 9 Feb 2016 02:14:12 +0000 (02:14 +0000)
author Jae Seo <jaeseo@google.com>
Tue, 9 Feb 2016 02:14:11 +0000 (02:14 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 9 Feb 2016 02:14:12 +0000 (02:14 +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	Jae Seo <jaeseo@google.com>
	Tue, 9 Feb 2016 02:14:11 +0000 (02:14 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 9 Feb 2016 02:14:12 +0000 (02:14 +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