tree 67c7dddb631b1e0b5f6fd721c896b15f29960688
parent bedda0df654edde984b0eabf011b709def33b0d9
parent 47f356d012543f359b0a23d3838337d9c457de34
author Elliott Hughes <enh@google.com> 1416245571 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416245571 +0000

am 47f356d0: Merge "Prefer "jpg" over "jpeg" as the extension for "image/jpeg"."

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