diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 14:13:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-08 14:13:24 +0000 |
| commit | 0e21e17d743275a60d3e5d90f26fc1b54e44700b (patch) | |
| tree | 254797498a86bccea2ce657a4dec70de12db91ad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 327132b1e57eb3f046ed127a21118f5b8c469a24 (diff) | |
| parent | 9a1595ec4ff40ee1666816f8265858db7a79dfe3 (diff) | |
Merge "[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" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions