diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-11-30 21:14:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-30 21:14:59 +0000 |
commit | 3b28a295f3f84c9a45cac3a1bc39080d5e4caa36 (patch) | |
tree | 92ccb474050427563022d3ee340e8effe9da9bb9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 923c95ad78bdcfa7c7bb55b1db83fc9a960d7fa3 (diff) | |
parent | 3b2d32b5bbb0a2e4de3b2ce446b6bdf54b21a9a8 (diff) |
Merge "Fix intdefs that were incorrectly defining "flag"" am: 4ca6de77af am: 3b2d32b5bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1514749
Change-Id: I2da2701ceb512486d94d0914df8d10451412fca0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions