diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:11:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:11:33 +0000 |
| commit | 56d101e48755e76b1697774378f1f7f57c2c956a (patch) | |
| tree | 0499fd7cab670d7543a006a636a61a070aed755b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d56c782f8d9d338627a39f321bcb7251c8b881c7 (diff) | |
| parent | 20cd95a7f62cdbbcfe9bd4ddcb59a80cd632e566 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE am: 60a6583adf am: 20cd95a7f6 -s ours
am skip reason: subject contains skip directive
Change-Id: I4600da20109a75e986c0e8988b493b9a0715b34c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions