Merge "TIF: Remove countryCode in TvContentRating" into lmp-dev

author Sungsoo Lim <sungsoo@google.com>

Tue, 5 Aug 2014 23:53:23 +0000 (23:53 +0000)

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

Tue, 5 Aug 2014 00:07:36 +0000 (00:07 +0000)
author Sungsoo Lim <sungsoo@google.com>
Tue, 5 Aug 2014 23:53:23 +0000 (23:53 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 5 Aug 2014 00:07:36 +0000 (00:07 +0000)
diff --cc api/current.txt
Simple merge
diff --cc media/java/android/media/tv/TvContentRating.java
Simple merge
author	Sungsoo Lim <sungsoo@google.com>
	Tue, 5 Aug 2014 23:53:23 +0000 (23:53 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 5 Aug 2014 00:07:36 +0000 (00:07 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
media/java/android/media/tv/TvContentRating.java	patch \|	diff1 \|	diff2 \|	blob \| history