summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-28 01:48:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-28 01:48:02 +0000
commitc80d04d17179edbff8a5af372398d8bd7f0230c7 (patch)
treefe928af1e89fe11d1f0f810e6869da70b9098e38 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent7a09a56c716f565e4ee143875ef5ea5cd588b788 (diff)
parentf307acae443e6c5351febea62b7f8a25e1820829 (diff)
Merge "Merge "Revert "Ignores protected broadcasts if not priv-app"" into pi-dev am: 1fac778d66 am: cbb60db519 am: eac7fa225b am: bd3635bd35 am: e424e3c30e" into rvc-d1-dev-plus-aosp am: dc13f55d1e am: f307acae44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886043 Change-Id: I5546823c210c88b64dbfbdd9cd940686e6476d34
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions