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-04-29 04:37:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-29 04:37:12 +0000
commit8c5933b5fef0447564f3616496b7d9e435e2c1b4 (patch)
treeabbde32791843ce4d496619488d159aaad3a7344 /opengl/java/android/opengl/Material.java
parent20ff61ee073567bedb7c8c56c45e8e62e261142d (diff)
parent2c2098d8e170227e20eb9e32502daacf9c9f4ae0 (diff)
Merge "Merge "BLAST: Avoid JNI call on creation" into rvc-dev am: 6fcbf83d5e am: 4bc809a6f4" into rvc-d1-dev-plus-aosp am: 2c2098d8e1
Change-Id: I7e0146a6900926515f4261d83199c43761908437
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions