summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-22 20:51:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-22 20:51:08 +0000
commit6476ad1d03c3815841fb0fca0e8d0f62edddae83 (patch)
tree5c66542da6252a033636e71f1bd067fb1b72400c /opengl/java/android/opengl/Material.java
parent84c4fd53b9ea48a689e829466ed9b349800e4bda (diff)
parent281a63c0ef7afdd15e95ceb3b6bd4076f98cb9d8 (diff)
Merge "Merge "Don't intercept touches when the qs scrollview can't scroll" into rvc-dev am: f27737a29d am: 3162f432a0" into rvc-d1-dev-plus-aosp am: 281a63c0ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11955698 Change-Id: Ie0eab409e3a8295ab9e07e7dd7db8699711dfaf2
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions