diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 21:03:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 21:03:44 +0000 |
| commit | f6fb4dd281bafa16b2665165a6d0671ec5011900 (patch) | |
| tree | d13b8a92c3f9e7b27dc8c3c551d1d03dfcd7b83d /opengl/java/android/opengl/Material.java | |
| parent | 8aa6d2a58d0f9746f77db5b2876d5b9d5a5a1db7 (diff) | |
| parent | 6476ad1d03c3815841fb0fca0e8d0f62edddae83 (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 am: 6476ad1d03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11955698
Change-Id: Ie3fbec52bc91f785aebbee005f5c12ac9dfb200e
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions