diff options
author | Christian Wailes <chriswailes@google.com> | 2020-08-06 13:11:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-06 13:11:42 +0000 |
commit | 5e0437a1b5d33fa947201667e1d159cc4106bb64 (patch) | |
tree | 0abc5148688c156d4bf6b39e161f72b1d18ee326 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 847b1d7cba1da16b0555c420752e68f05e25f9db (diff) | |
parent | c82b42a599402bc655f76f3aad7959293a7572fe (diff) |
[automerger skipped] Merge "Rename blacklist to denylist" am: 0f2d849c39 am: c044cd9bb1 -s ours am: c82b42a599 -s ours
am skip reason: Change-Id If8bb7c923f1ce8d8ce8c3142bf1b674982a96573 with SHA-1 b656b9540a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379680
Change-Id: Iff5184afb8d9f4544b70e97afb44c72e8411137f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions