diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-08 14:12:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 14:12:55 +0000 |
| commit | 9a1595ec4ff40ee1666816f8265858db7a79dfe3 (patch) | |
| tree | 254797498a86bccea2ce657a4dec70de12db91ad /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bd5658dcf3b43ad6d18c633b06221f0d51e896a9 (diff) | |
| parent | 041289b885cfdbd528f5798793522d85476daa09 (diff) | |
[automerger skipped] Merge "Identity: Update requirements about SessionTranscript CBOR and provisioning challenge." into rvc-dev am: f909d9f0ef am: 5f1f421286 -s ours am: 041289b885 -s ours
am skip reason: Change-Id Iacdf89744bbd30c5a10d6cba873147e424ddb01b with SHA-1 5641fe4141 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11753727
Change-Id: Id9b1b8d9701e1de44227446686d1df8d449ecf2c
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions