diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-01 18:27:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-01 18:27:58 +0000 |
| commit | d41f29a48ab6f310b989af7bba87d172e61033c4 (patch) | |
| tree | 63f456b7fb79a95a3f7de69988a4e9016d2b3506 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 79608852e57d5f8a46a106037f97fa6686ff151e (diff) | |
| parent | cdf8df003b61bb2dcf27ea8f3d7fcae1e0e07dc5 (diff) | |
[automerger skipped] Merge "Convert mask types from uint32_t to enum type" am: bcc75f0be4 am: 5ffb396f54 am: cdf8df003b -s ours
am skip reason: Change-Id I7f32a7c7741dea88fa2fd8a2e7fe50d0c31eb2e7 with SHA-1 93ce89aa73 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510612
Change-Id: Ib4ed380a7352c07b58dd9fff5e5de784dec1a7cc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions