| commit | a828dd0d222956774ca77db08b1c7e40de3faa94 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 26 20:26:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 26 20:26:04 2014 +0000 |
| tree | bf4a560112abf9df716c9db0ebfe4bf03b8bbdd8 | |
| parent | 1a350cb2103434af20c4f89a10d4be3b767e3896 [diff] | |
| parent | 0d9d721694762218aeb26472a208057d72efc97c [diff] |
am 0d9d7216: Merge "Rearrange a few of our MIME type registrations." into lmp-dev * commit '0d9d721694762218aeb26472a208057d72efc97c': Rearrange a few of our MIME type registrations.