Commit d6abb468 authored by Paul Miller's avatar Paul Miller Committed by Android Git Automerger
Browse files

am c4fb4472: am 23cfdd20: Merge "Expect "jpg", not "jpeg", in testGuessFileName" into lmp-mr1-dev 

* commit 'c4fb4472':
  Expect "jpg", not "jpeg", in testGuessFileName
parents 852c714b c4fb4472
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment