| commit | 0931d0ab431f09f30535a9ca889986bfca21cda8 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 16:47:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 16:47:42 2015 +0000 |
| tree | 8b99b9eca46ec6f323a078c648ad93f56bcc1851 | |
| parent | a39fb36966b09b9599dffdac4bb3b78f804c09a3 [diff] | |
| parent | 98cefc3dabeb6a5fde2d9267070ab75ccd5b915f [diff] |
am 98cefc3d: am e961b09b: am 37581fa5: Merge "CtsVerifier: update mPreviewTex in case of mismatch with mFormatView" into jb-mr1.1-cts-dev automerge: db2f7f4 automerge: 8236bcd automerge: 675f1cc * commit '98cefc3dabeb6a5fde2d9267070ab75ccd5b915f':