summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2020-04-08 01:38:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-08 01:38:45 +0000
commit0039769dd12b6093c8f99a33c87afc1724ba4a64 (patch)
tree2f1712dc3c6f2eb26c3c9aac9011d3992d34f6e1 /opengl/tests/gl_basic/gl_basic.cpp
parent9f84de4975c2879739e02497d6f3f5eedae77860 (diff)
parent9b7aed8c498de33ba1d1b4b31de2a4da7c0ad720 (diff)
[automerger skipped] Merge "Fix order of uid/pid in LocationAccessPolicy" into qt-dev am: a2b7cd539e am: 2994fd8537 -s ours am: 5000bfbdc7 -s ours am: c080d61c0b -s ours am: 65d0eac4a3 -s ours am: 9b7aed8c49 -s ours
am skip reason: Change-Id I479c8fc123d5a994e8cbe6489aa00bea4abca1c7 with SHA-1 7e826f9531 is in history Change-Id: Iec2f6e6297314f61141c150a0258c56b8f4346dc
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions