diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 09:50:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 09:50:19 +0000 |
| commit | 4cd7d533a4e4162306b7c2b4e4b97c67d2088896 (patch) | |
| tree | 94aa162e78e5259128ebc07ac3a3e309a2d2802c /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 2b9184de2672fdccef8c210932ea9a73c37ffe07 (diff) | |
| parent | 6b870993f484448f79f7b10856c20373d926eaf6 (diff) | |
Merge "Merge "Fix the multi-fingers gesture conflict with TouchExplorer" into rvc-dev am: 18905eb623 am: 3bbed462b9" into rvc-d1-dev-plus-aosp am: f5e64866ab am: 6b870993f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953898
Change-Id: I0fe1c47c73e9ec42ac5a3e68dbd6348b9379c6e6
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions