| commit | 83cef1fc6d16b19bcf51997416afa42eecee4310 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Sat Sep 12 06:29:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 06:29:57 2015 +0000 |
| tree | 9b9bccec25a0ba5971ebe36e6f90996973d52725 | |
| parent | 3e9de2dcfe032228ef78ffe97ed4222ba9edabfc [diff] | |
| parent | 111d290a3b6f682e0ad60faf0a3c17afff0b2ee8 [diff] |
am 111d290a: am 19ea5424: am 2cafea38: am 90dc2f92: am 675f1cc7: Merge "CtsVerifier: update mPreviewTex in case of mismatch with mFormatView" into jb-mr1.1-cts-dev automerge: db2f7f4 automerge: 8236bcd * commit '111d290a3b6f682e0ad60faf0a3c17afff0b2ee8': CtsVerifier: update mPreviewTex in case of mismatch with mFormatView