diff options
| author | Alex Johnston <acjohnston@google.com> | 2021-05-05 16:29:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-05 16:29:04 +0000 |
| commit | f78caf8ec3996c810189ad81faa53091f5d81b09 (patch) | |
| tree | b40b8818ee67fe323cb17707551d9ec59d68bcf4 /mime | |
| parent | fa506656203da71f453f1d02a866c707e1fa7c8d (diff) | |
| parent | 9ca2d03ff260533fe3f3ce7b1a365e50825e6964 (diff) | |
Merge "Allow installation of cert with .der extension" into sc-dev
Diffstat (limited to 'mime')
| -rw-r--r-- | mime/java-res/android.mime.types | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types index 92365d1af4c9..587367737be0 100644 --- a/mime/java-res/android.mime.types +++ b/mime/java-res/android.mime.types @@ -139,7 +139,7 @@ # that may have been defined earlier. application/pgp-signature pgp -application/x-x509-ca-cert crt +application/x-x509-ca-cert crt der audio/aac aac adts adt audio/basic snd audio/flac flac |