Merge "TIF: use @StringDef annotations in TvContract"