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-19 08:29:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-19 08:29:23 +0000
commit96645c99b5ef9a511de5732c5d3929b568ba99d2 (patch)
treecbb6270adced8ab9041909c016e35385b9f05af1 /opengl/java/android/opengl/Material.java
parent558481c15921f77d50e3ff05c089fa9e9a4c1105 (diff)
parentac1c1de02e4f8bf4a5057930fe2ade5a07e618d6 (diff)
Merge "Merge "Fix MediaEvent release issue" into rvc-dev am: c266b0398e am: c32bb0577d am: 046bc5d78a" into rvc-qpr-dev-plus-aosp am: ac1c1de02e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11897358 Change-Id: I44e26e8cef027c3b50bbea9bb28ec7829b22ac33
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions