diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-08 01:42:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-08 01:42:46 +0000 |
| commit | 5be4e9f75691200fff659d101288ec3b12bc15e8 (patch) | |
| tree | c0bef3f302f632c036734a617a454e61806bead7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0bdb830ab1687c5910baedcdddaa4052d3998e1c (diff) | |
| parent | 5eab8b117d066e43f4fa10cc0b29258742d11da9 (diff) | |
[automerger skipped] Merge "Require a more specific intent" into qt-dev am: 4305c5fbf8 am: 663079facf -s ours am: 07fb4f8818 -s ours am: a15824b211 -s ours am: f395b23fa5 -s ours am: 3c5db25f37 -s ours am: 5eab8b117d -s ours
am skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 d16e86f466 is in history
Change-Id: Ieb6707a337ff6399fe51f9c5b7d5ebe0dd09c95b
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions