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-08 16:20:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-08 16:20:34 +0000
commit54988195095ef82d0ea3c4043ed858cc0fd81af2 (patch)
treef09d3422b2166494ee4784a065ec112088d47ec4 /opengl/java/android/opengl/Material.java
parentb39fc3ce1628a87483a1ff7242f8ff604bf2d041 (diff)
parent6d9feee2638ecd9028c63583e95ad41fb1d2b78c (diff)
Merge "Merge "Insets: Fix stuck mPendingFrame" into rvc-dev am: 88e86e641a am: a50aa34d52 am: 35d0385fc8" into rvc-qpr-dev-plus-aosp am: 6d9feee263
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744899 Change-Id: I0733095872ff932a161b3db88670a50169c66b7f
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions