diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2019-07-27 22:21:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-27 22:21:46 -0700 |
| commit | 7467c228d49aa1164ecd83c8db5e38870be34fcc (patch) | |
| tree | 785e0d4b08fe0a94d81865a18cf6587fd7feaea5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ddd601664e26ec466742b1337d17a61db8208304 (diff) | |
| parent | a32feddc5616c3867b58e32364f2f95e0707dbf5 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Don't drop restricted permissions on upgrade am: 0b41c8940a am: 29adaea681" into qt-r1-dev-plus-aosp am: 93c9d61865
am: a32feddc56 -s ours
am skip reason: subject contains skip directive
Change-Id: I574c1297bd6d08c8b207215ca0490f9c61d3eb26
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions