diff options
| author | Benjamin Franz <bfranz@google.com> | 2021-01-12 16:41:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-12 16:41:53 +0000 |
| commit | 9f7867cee2875351c9f4efa44ae4892f72158e84 (patch) | |
| tree | c1ce6c02aa8de9b9f52908ba987c4ac828722e17 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 23dbba641c6ed361d47427789fa4f9a344126011 (diff) | |
| parent | 899cd8920b4ded09e7c623ef2076ade54ffab24c (diff) | |
Merge "Add new overridable annotation to platform compat" am: 458515e464 am: 899cd8920b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540124
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie8c48feb66285ec4153d61eb83ff8967dae28adf
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions