diff options
| author | Anton Hansson <hansson@google.com> | 2020-12-07 21:12:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-07 21:12:51 +0000 |
| commit | 459d9d45d43318b870830b6be5aac50e51e14ad1 (patch) | |
| tree | 604eab8fb0c4be7c55a0070a27b842306e59d2f4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3f9c3956dfdcf85487a28e946f11e8a70268a1a8 (diff) | |
| parent | 60fc6b2406ce5324e8930312dc27066161d58917 (diff) | |
[automerger skipped] Merge "Add VERSION_CODES constant for S" am: dfe33cb756 am: 230a340757 am: 60fc6b2406 -s ours
am skip reason: Change-Id If5c3b92063b8d9fb3f9b6272eb2cfef448065380 with SHA-1 f2aa636c76 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513731
Change-Id: If53b57e60edb7d99352ad768b69b725f11751a20
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions