summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChen Xu <fionaxu@google.com>2019-02-12 19:22:24 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-12 19:22:24 -0800
commit59d8f8e1f8dc042ab546e0231136eca9cdd772d7 (patch)
treea99169ffcfaa5b16e7beb4c1be0812935855fd7e /opengl/tests/gl_basic/gl_basic.cpp
parentc54e122a7f60d1a6324a6dd37e60c7cc4a8699fa (diff)
parent61c92a7da779cde7806c6a490e46163eb7cd54ae (diff)
[automerger skipped] Merge "Address API feedbacks for networktypebitmask" am: 307f4cfeb1 am: acb14bcf46
am: 61c92a7da7 -s ours am skip reason: change_id Idf0f88225c20fc0ed10ae4fccb705f988a3bec60 with SHA1 75b486e4c8 is in history Change-Id: If2672f90225a113e9a471abf16ecedd92228d533
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions