Merge "TIF: Put comments for the newly added US and Canadian rating strings"

author Jae Seo <jaeseo@google.com>

Wed, 29 Apr 2015 02:57:23 +0000 (02:57 +0000)

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

Wed, 29 Apr 2015 02:57:27 +0000 (02:57 +0000)
author Jae Seo <jaeseo@google.com>
Wed, 29 Apr 2015 02:57:23 +0000 (02:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 29 Apr 2015 02:57:27 +0000 (02:57 +0000)
diff --cc media/java/android/media/tv/TvContentRating.java
Simple merge
author	Jae Seo <jaeseo@google.com>
	Wed, 29 Apr 2015 02:57:23 +0000 (02:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 29 Apr 2015 02:57:27 +0000 (02:57 +0000)