diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-10-13 13:42:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-13 13:42:52 +0000 |
| commit | fd07e6b38dab3253f7eca843f6f4c1714105867d (patch) | |
| tree | ba40f6c8cce39095083b749ebe483c338281d787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e0bffe2ab1da780313ca61721481c570b318a454 (diff) | |
| parent | 6e4e897c7782319141bf850e81f4ebf15d7dd584 (diff) | |
[automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: a68d603483 -s ours am: 80dc50df37 -s ours am: 6e4e897c77 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956
Change-Id: Ia425c0a510ef3fdeffbda19c4f33eaba48ebd23d
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions