diff options
author | Winson Chung <winsonc@google.com> | 2020-08-10 17:00:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-10 17:00:00 +0000 |
commit | 24e04aade0c3c80f8486b80e58e7bdd65ef0fef0 (patch) | |
tree | a7de44af6239cd25b2241bbfbd7addb0a080e36d /rs/java/android/renderscript/ProgramStore.java | |
parent | 141d0a01e2ad07cd4b1c271a49c12571177eb466 (diff) | |
parent | ce223d88deb52bececb53977043a4233ae440b40 (diff) |
[automerger skipped] Merge "Also factor the floating rotation button into the active touch region" into rvc-qpr-dev am: 8c13a90189 am: ce223d88de -s ours
am skip reason: Change-Id I798370b41041e4f02bb82f5aeb20b9ccc1d2a4e8 with SHA-1 3e64e959ea is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12336147
Change-Id: I64d42dfacf1ca8e86fb4c055aa064107c4e00c1e
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions