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