Merge "TIF: allow time also in COLUMN_RELEASE_DATE" into oc-dev

author Dongwon Kang <dwkang@google.com>

Mon, 8 May 2017 23:56:04 +0000 (23:56 +0000)

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

Mon, 8 May 2017 23:56:11 +0000 (23:56 +0000)
author Dongwon Kang <dwkang@google.com>
Mon, 8 May 2017 23:56:04 +0000 (23:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 8 May 2017 23:56:11 +0000 (23:56 +0000)
diff --cc media/java/android/media/tv/TvContract.java
Simple merge
author	Dongwon Kang <dwkang@google.com>
	Mon, 8 May 2017 23:56:04 +0000 (23:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 8 May 2017 23:56:11 +0000 (23:56 +0000)