diff options
| author | Anton Hansson <hansson@google.com> | 2020-09-08 09:59:23 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-09-10 08:18:00 +0000 |
| commit | 5480adb11d0217f71957aa37d0d3dbd8f00f1d4a (patch) | |
| tree | cd2347e81a4330af9116be18a0596bf3d1126ff6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7532b2210d458e279cb592d4a78da43279bbca28 (diff) | |
| parent | 6a0ecfb94f18447d5328ffab7365ff1f46449574 (diff) | |
Merge mainline-prod into master
$ git merge -s ours origin/mainline-prod
There are only two commits not from upstream:
05cdb9972ac11770ab155b8b8e7fe61fcc168011
1be2664406a2e697044f483a44c547973f915e3d
But both of these are noops in master (due to Merged-In).
Bug: 168176832
Test: presubmit
Change-Id: Ic61fc2939b03615e152c37fd762dbcd81546f705
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions