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