tree 2d17ca71d06bd038b0e35d22763d113878d7af34
parent 852c714b03e18da2ef3b294a441ed97b47ba5b11
parent c4fb447213634dd386075d7caa510d503fda5789
author Paul Miller <paulmiller@google.com> 1418168921 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418168921 +0000

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

* commit 'c4fb447213634dd386075d7caa510d503fda5789':
  Expect "jpg", not "jpeg", in testGuessFileName