diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-08 14:14:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 14:14:07 +0000 |
| commit | ab39a8d01f7c98cc289282d57f5b095e51fb79ce (patch) | |
| tree | 254797498a86bccea2ce657a4dec70de12db91ad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0e21e17d743275a60d3e5d90f26fc1b54e44700b (diff) | |
| parent | 9ed4fc6c4400eed8eb213360a9d242b86b9f9944 (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 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: Iccd162435964c321ac216f2d8c7d81a9ba338e26
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions