| commit | 4b7403262aa793fcdf55ca13e26ad82d3361ffc4 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:00:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:00:11 2015 +0000 |
| tree | 46d5567b2ac4dbb3a230df5a6432c882272a862c | |
| parent | 5e7165c03f5536d73a898f748962ae8343bb10ab [diff] | |
| parent | 0931d0ab431f09f30535a9ca889986bfca21cda8 [diff] |
am 0931d0ab: 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 '0931d0ab431f09f30535a9ca889986bfca21cda8':