tree 67c7dddb631b1e0b5f6fd721c896b15f29960688
parent b0ac0c37038f0fd9ad957d8dc17d3c12fcbe2507
parent 9a9c59af7f1003f6e35ce060482eefda40b380f1
author Elliott Hughes <enh@google.com> 1416253665 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416253665 +0000

am 9a9c59af: Prefer "jpg" over "jpeg" as the extension for "image/jpeg".

* commit '9a9c59af7f1003f6e35ce060482eefda40b380f1':
  Prefer "jpg" over "jpeg" as the extension for "image/jpeg".