| commit | d384df013d242a530f70bef052ccdf2406fe7d87 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:31:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:31:28 2015 +0000 |
| tree | 0fe003ba0d24a69430cffa048f11766abc81bc61 | |
| parent | 9ff82d3c265b1d66312f4fb00cb0f024217e0d15 [diff] | |
| parent | 56a40df6f2b837a1c7817b5c99bcc2b661a66595 [diff] |
am 56a40df6: am b97f8033: am 4b740326: 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 '56a40df6f2b837a1c7817b5c99bcc2b661a66595':