diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-01-06 15:22:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 15:22:38 +0000 |
| commit | 8c828565230d29d714dee1052ac7562b9344bb93 (patch) | |
| tree | d26f25a2ae5e3cc4bc1a62ed31a68b360191ef08 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dafd1053cfc13991e6585968cbff8fe69e4766c5 (diff) | |
| parent | 4d4aa881b0680240e667b4532baa3a57f2451c78 (diff) | |
[automerger skipped] Merge "Migrate away from AsyncChannel in NetworkAgent" am: 91348d9f22 am: 2652fbdaf1 am: 4d4aa881b0 -s ours
am skip reason: Change-Id Ie364ab50f416e7821e70f4539a881eea828e1256 with SHA-1 fb9c6e8d3c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie47420e86dfe4aec19162545116023c9da75aa14
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions