diff options
| author | Patrick Baumann <patb@google.com> | 2020-08-28 01:50:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-28 01:50:12 +0000 |
| commit | d228424cdc56412b16b6345413a8f01bf8459e88 (patch) | |
| tree | fe928af1e89fe11d1f0f810e6869da70b9098e38 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c80d04d17179edbff8a5af372398d8bd7f0230c7 (diff) | |
| parent | 469175c82bcd23ca4a54fd9388c3ed51807fd924 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb am: 83fac841f8 -s ours am: bb5558fe58 am: bf7499c1b1 am: 98eb87b770 am: 469175c82b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10938446
Change-Id: Ibb1a3b1227a11ddab6ca6880c30f273e9ca653ff
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions