diff options
author | Xin Li <delphij@google.com> | 2020-12-07 21:10:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-07 21:10:21 +0000 |
commit | 8341f875acb16b61255bc7b0ec116cc4a27cbfa4 (patch) | |
tree | 604eab8fb0c4be7c55a0070a27b842306e59d2f4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 75bbc399e94cd3d3584533818d34d70868da1be4 (diff) | |
parent | 489388fc1b27d2eed0f00b0be32dfcdbb00e4081 (diff) |
[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: 8836e88707 am: 489388fc1b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13176713
Change-Id: Id3f9bffc8ed1a04693ba5a87aa5f8b512bd5a935
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions