| commit | 2fbf4e40d81d8884293b9a7f22379caad4d05020 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 15 20:07:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 20:07:07 2015 +0000 |
| tree | 6dad61a8948153ccfb2718b48cbb1d70262f4d2d | |
| parent | 39302816a73a076c0d7165b8d995f33789301f17 [diff] | |
| parent | 90a8383df1027ef2de4fa767bdcff88b80210d02 [diff] |
am 90a8383d: am 83cef1fc: 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 '90a8383df1027ef2de4fa767bdcff88b80210d02':