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 07:09:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-08 07:09:18 +0000
commitaaabfc72a46abc3f2abbd175cfe2bf83748101a4 (patch)
tree374b88169ea651569f04959e110fb971955b40a0 /opengl/java/android/opengl/Material.java
parent2bbbd4fdb772634acb5797186ac14cff214078b9 (diff)
parent693215f367099d20a0ca417b2d0c4ac63dbcad98 (diff)
Merge "Merge "Ensure that stack view exists when applyUpdate" into rvc-dev am: 4d18ea162b am: ee2a6b9489 am: 669fe21ea9" into rvc-qpr-dev-plus-aosp am: 693215f367
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11754102 Change-Id: I540e925a85613894d1dd89baf265ae021bbf8e44
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions