diff options
| author | Xin Li <delphij@google.com> | 2020-09-01 21:46:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-01 21:46:39 +0000 |
| commit | 51c2f35906580ed6e1447524d22b672e251e1eda (patch) | |
| tree | 786287e4d8af61d18b817f72a58617d5f23478e8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ddf2351c068477378c3ab3156b79d79b41ae0912 (diff) | |
| parent | 4467c2f6ecdbb3a1bac085d16693f45e8443fa51 (diff) | |
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 4467c2f6ec -s ours
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850
Change-Id: Icebcb9092d11694141d0d6a0c47c9f8378f5b03a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions