am a49159c5: am 88a6ada7: am 746a550b: Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev

* commit 'a49159c53f258a62afdd6ebe1e156e907b01ced4':
  TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
This commit is contained in:
Jae Seo
2014-09-02 17:45:27 +00:00
committed by Android Git Automerger

View File

@@ -945,8 +945,8 @@ public final class TvContract {
/**
* The comma-separated audio languages of this TV program.
* <p>
* This is used to describe available audio languages included in the program. Use
* 3-character language code as specified by ISO 639-2.
* This is used to describe available audio languages included in the program. Use either
* ISO 639-1 or 639-2/T codes.
* </p><p>
* Type: TEXT
* </p>