diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-10-13 13:42:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-13 13:42:50 +0000 |
| commit | e0bffe2ab1da780313ca61721481c570b318a454 (patch) | |
| tree | ba40f6c8cce39095083b749ebe483c338281d787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c9cd9ad71a0969bffcc67dc2b919cd3a9cc1e544 (diff) | |
| parent | 102e8bf3b51d0782fb444abf055c22363d4a9582 (diff) | |
[automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: 9c6bc472e1 -s ours am: 65cf394942 -s ours am: 102e8bf3b5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956
Change-Id: I61a202e8b1639470cc142c107ffde60e061f4d7a
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions