diff options
| author | Makoto Onuki <omakoto@google.com> | 2020-07-16 17:47:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 17:47:20 +0000 |
| commit | b638f3f7816acde1789d0cf34ea66bb4fd9f5e12 (patch) | |
| tree | 64f0adcfa7cc6e8b153f39227160c0cdf44ace6a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 568afcc4bf0a596e60f0e832d707180310ba7ad2 (diff) | |
| parent | 64c0906ecdf305428b159313cdf35ef585e9d96c (diff) | |
[automerger skipped] Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68ead am: 2f20e9afe7 am: 10d116d1ec am: 2cb250d6a5 am: 64c0906ecd -s ours
am skip reason: Change-Id I9e8038b3899270ada12ed4cc057aeace2a36902d with SHA-1 f4a486ec50 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363799
Change-Id: I05fcf0c6f37323b0f66e6959a44c273d64ed02b6
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions