summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorJooyung Han <jooyung@google.com>2020-06-23 00:09:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 00:09:32 +0000
commit448a2a9d9416cbdaaf80cbaf1eabc244c0824757 (patch)
tree1b6e5ce4b91d7a71902eecca35279e8c883e967e /opengl/java/android/opengl/Material.java
parent92cae0f02de6c6877215d2b1d23d8efeced4e567 (diff)
parent644a857f65ae4e891d22dfffa05f7a43709f541f (diff)
[automerger skipped] Merge "make CtsShim*Prebuilt available to platform" into rvc-dev-plus-aosp am: 9ffca3f46d am: 9034e7e3d4 am: 644a857f65 -s ours
am skip reason: Change-Id I5eec7a62e07f9d5138f7fd71268d5dd2ca2e77d4 with SHA-1 ab9f225662 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954239 Change-Id: I7026f66ae7a6818ecf9fefa630d30ff0ba12d1c7
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions