diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-08 14:33:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 14:33:20 +0000 |
| commit | ded8ba76add45c259f47b166bfa78c6c6a58caa5 (patch) | |
| tree | 65cb04545821bdc59b3c83049773433084236ea2 /opengl/java/android/opengl/Material.java | |
| parent | 922a524a4d9b5f847125ad2f8d978a3c843d9df2 (diff) | |
| parent | ab39a8d01f7c98cc289282d57f5b095e51fb79ce (diff) | |
[automerger skipped] Merge "Identity: Update requirements about SessionTranscript CBOR and provisioning challenge." into rvc-dev am: f909d9f0ef -s ours am: b73ff90918 -s ours am: 9ed4fc6c44 -s ours am: ab39a8d01f -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: I36d6dc5232671932a13bcc4b21aa9d712d2cc472
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions