diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2021-01-12 03:42:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-12 03:42:16 +0000 |
commit | 2f01d3d29db9450d3f993478dc4c4140cff4313b (patch) | |
tree | 5fd224a55389f1e94ed2ff2c034e465cb695c18d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4cd3f32ec7bd93d0099c74b81d1e36f59a85be1f (diff) | |
parent | ce98a47a895f04088831f21848c3ff3f123ea5c8 (diff) |
Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: 2f0fafeb11 am: f931a80e81 am: ce98a47a89
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81a7577b0cf474bbb53ca38ddd093ba4342ab543
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions