diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-08 01:39:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-08 01:39:51 +0000 |
| commit | 19440e6afb21a163402b9ef4c783057ca156b0f1 (patch) | |
| tree | 1157293cbdd0d7f740bddd5c71700fbd57ef3bd4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cdb65230ffa5f184a6529d7e044275468f1fa81c (diff) | |
| parent | 2b78e1faa0b5a6fe7d3cfd04819c3f0e2b1d1d4e (diff) | |
[automerger skipped] Merge "Require a more specific intent" into qt-dev am: 4305c5fbf8 am: 663079facf -s ours am: 07fb4f8818 -s ours am: 4dec728186 -s ours am: 386daba160 -s ours am: 2b78e1faa0 -s ours
am skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 d16e86f466 is in history
Change-Id: I479668c64edb7473165b7f5c599508488f023788
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
