| commit | 56a40df6f2b837a1c7817b5c99bcc2b661a66595 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:21:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:21:29 2015 +0000 |
| tree | 98509ed57ed5de37df6e0e64ba266e75c156c743 | |
| parent | 59b4c14d4def3d39c070b6ecd0f76866f599135c [diff] | |
| parent | b97f80337b39b87a5fd5419f7cc81b2ba7dc1db8 [diff] |
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 'b97f80337b39b87a5fd5419f7cc81b2ba7dc1db8':