diff options
| author | Anton Hansson <hansson@google.com> | 2020-12-31 12:39:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-31 12:39:19 +0000 |
| commit | 3756bb9cd99eef8a2bb231f5050f24d0b92311f0 (patch) | |
| tree | 8169172a772add3e25db5f9b6718bb580a0bb562 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0883daddf17f142163d8ce934275796ecb5177ca (diff) | |
| parent | 4b72f351acd39f22db9f60d16c92c5273e1bc061 (diff) | |
[automerger skipped] Merge "Extend RollbackManagerService to handle S extensions" am: 9f2c15890c am: f4930cfd33 am: 4b72f351ac -s ours
am skip reason: Change-Id I2de18f67f21ea6c57d612829749edeaa11378f41 with SHA-1 a021b767a6 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517738
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If339701a0fe9a65583821094f3ea1ae2ca591cf7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions