diff options
| author | Tyler Gunn <tgunn@google.com> | 2019-03-03 20:46:40 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-03 20:46:40 -0800 |
| commit | 74c4d2a2dd1cacdf0e52b411cd0eaeb4232e228d (patch) | |
| tree | 9ee191db1f5c8a41e46ff2478f3507074dbc939c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5af401bd35a188a4a8c928f66993bf2c22247f2c (diff) | |
| parent | 0f945a1ce96dd25dd963f0345c08e42c9937f567 (diff) | |
[automerger skipped] Merge "Correct nullability and final constraints on new APIs." am: cdbfa9d087 am: 5a7b8ca4e0
am: 0f945a1ce9 -s ours
am skip reason: change_id Icec15403493de596194a61b27bb3e1031fdc1099 with SHA1 5c1a4e0bf3 is in history
Change-Id: I7d95b3bbf9721a9edd2ca6642fb6f3415e9a36cc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions