diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 07:23:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 07:23:52 +0000 |
| commit | 9f525c4cfe6348aeac4431e76669fada2506be87 (patch) | |
| tree | ebbe9e9d3e0c1e75cd88dcfc1e4efa209d697fbb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8cda25efa6746020a368b13f71de75674eee3a14 (diff) | |
| parent | bcda3722300ba48a33759890776fd23be63e75d2 (diff) | |
[automerger skipped] Merge changes from topic "am-c6168f81c15b4bdc8b95f05dbf2b9ba8" into rvc-d1-dev-plus-aosp am: 5e1ec58ad3 -s ours am: bcda372230 -s ours
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 83f6a384cb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: If5412dd79954536f3b2d903ff0e3d5eaa40f35b1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions