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