diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-10 06:55:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-10 06:55:56 +0000 |
| commit | 70e0f6035ac5096e9b61064208b835fba20e8455 (patch) | |
| tree | 584c818be25b77c570de785304b38b81814f2c0d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ddc40b5ce203a2d04c512c1267c8bd9837d59b53 (diff) | |
| parent | 250855cb843cb12e7e0b9a0d353b28346e8b191a (diff) | |
Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 250855cb84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572981
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I83b4210780cf87006be5f55439ade06cd7893530
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions