| commit | c4fb447213634dd386075d7caa510d503fda5789 | [log] [tgz] |
|---|---|---|
| author | Paul Miller <paulmiller@google.com> | Tue Dec 09 19:05:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 19:05:01 2014 +0000 |
| tree | 62b733548a458a0431fa8571d85e80641e8eac47 | |
| parent | c7ea26d3d542aecb128a077bb8f576bd169d987e [diff] | |
| parent | 23cfdd205e0b0c1e4864fc743aff851299c28084 [diff] |
am 23cfdd20: Merge "Expect "jpg", not "jpeg", in testGuessFileName" into lmp-mr1-dev * commit '23cfdd205e0b0c1e4864fc743aff851299c28084': Expect "jpg", not "jpeg", in testGuessFileName