diff options
| author | Patrick Baumann <patb@google.com> | 2020-08-28 01:45:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-28 01:45:13 +0000 |
| commit | 965dfa2552ab2ea5469290df286ddc2028698084 (patch) | |
| tree | fe928af1e89fe11d1f0f810e6869da70b9098e38 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d7c8d376c12152ed560442a77b96b1b17c6ef04f (diff) | |
| parent | 44730496d19c5c4482e8c9319d22526646d254a6 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb am: 83fac841f8 -s ours am: bb5558fe58 am: 938fb7e821 am: 987c297857 am: 44730496d1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10938446
Change-Id: I028d2cd49590d36dd64c74242b13eda7d695922a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions