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