diff options
| author | Jae Seo <jaeseo@google.com> | 2014-09-02 16:20:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-02 16:20:28 +0000 |
| commit | 65899b10929dca755fbc43161fe5017e1fd0f0cc (patch) | |
| tree | ef41414bdc87a560c0c96564d87fd67a8679a10b | |
| parent | 9e85408f12a0a5c172805c8f5863f8998ef570a1 (diff) | |
| parent | d6ae33bd6abfe2ec7f6ec6279711f625d75d0924 (diff) | |
| download | frameworks_base-65899b10929dca755fbc43161fe5017e1fd0f0cc.zip frameworks_base-65899b10929dca755fbc43161fe5017e1fd0f0cc.tar.gz frameworks_base-65899b10929dca755fbc43161fe5017e1fd0f0cc.tar.bz2 | |
Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev
| -rw-r--r-- | media/java/android/media/tv/TvContract.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 7f1c304..b3890d4 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -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> |