diff options
| author | Xusong Wang <xusongw@google.com> | 2021-04-23 02:41:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-23 02:41:36 +0000 |
| commit | f89ad4b416edcb4f9a4aba96bc5b5a27172af128 (patch) | |
| tree | 7d454edc81183aa83e02ec2948f26e99781abbc6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 592d5b54c6464129c446b4b0a9d40d0a98b1043c (diff) | |
| parent | 33be8eec88cc2975a32a28bec3b29f2cf557c390 (diff) | |
[automerger skipped] Merge changes from topic "rs-deprecation" am: 67485cf930 am: 9b5047f696 am: 33be8eec88 -s ours
am skip reason: skip tag Change-Id I50b7ce18841eb38f2e5d986307afd91791efdf7b with SHA-1 efbe8ac645 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683499
Change-Id: I142fc8fb529cc2c0d656dac2d2d54c51545a1aa0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions