diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-27 16:17:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-27 16:17:50 +0000 |
| commit | ceaa221c97b864b5569d72dbcd2308c4de749596 (patch) | |
| tree | 93139a6fcb802d383f9807d3e459a5d5a1f5b91b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ed5109692aa59c6d07e3a8852714ff8559bf102d (diff) | |
| parent | d58d6bfd3848f9d0317557753e7c5d2203f0c972 (diff) | |
[automerger skipped] Merge "Update clock burn-in so it doesn't clash with udpfs" into sc-qpr1-dev am: d58d6bfd38 -s ours
am skip reason: Merged-In I6f95fe3ad763971b804129b517f4c98192ab3674 with SHA-1 9b62051f88 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853618
Change-Id: I8ea4bdd094555484e87ed8726f20973258a65286
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions