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-05-31 07:17:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-31 07:17:09 +0000
commit2db4356844ac3db4a0552cafbc75e9e60eb891b4 (patch)
tree350b430ac6c6d090d6ffecd9b4aa4595329ae298 /opengl/java/android/opengl/Material.java
parent50aeacb8a219b5ba153a29ae46264ec2c542b1fc (diff)
parent9a4b94f1063c39c7b239e5429603335994d42fda (diff)
Merge "Use java_sdk_library for API for updatable-media am: 289a482fea am: d5cc126091 am: 835ba54f4f" into rvc-qpr-dev-plus-aosp am: 9a4b94f106
Change-Id: I4974a67327e584e49232c575fcf6925caf839029
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions