tree 76e463d232999ba78aea66168c119622ba0cbd77
parent 657afa6cd8da378f30afe7b491e6d9de6c7c23fd
author Elliott Hughes <enh@google.com> 1416011235 -0800
committer Jeff Sharkey <jsharkey@android.com> 1416244209 -0800

Prefer "jpg" over "jpeg" as the extension for "image/jpeg".

Bug: 18390752

(cherry picked from commit 2a63032eb1c020ad3e73177951142735e11e044e)

Change-Id: I713930b8ad8d8a1353d289c1f9268159c3ad862d