| commit | d6abb468e7c4e9bf96716397aa4933da2d89895b | [log] [tgz] |
|---|---|---|
| author | Paul Miller <paulmiller@google.com> | Tue Dec 09 23:48:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 23:48:41 2014 +0000 |
| tree | 2d17ca71d06bd038b0e35d22763d113878d7af34 | |
| parent | 852c714b03e18da2ef3b294a441ed97b47ba5b11 [diff] | |
| parent | c4fb447213634dd386075d7caa510d503fda5789 [diff] |
am c4fb4472: am 23cfdd20: Merge "Expect "jpg", not "jpeg", in testGuessFileName" into lmp-mr1-dev * commit 'c4fb447213634dd386075d7caa510d503fda5789': Expect "jpg", not "jpeg", in testGuessFileName