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 00:24:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-29 00:24:58 +0000
commita44135d792089d910c2f7aab3b515dd856b3ea9c (patch)
tree783574f07a5ec04fa9a35bf1f8b74308d4e0d280 /opengl/java/android/opengl/Material.java
parent9df047a5afc3d83cce713a0afe5a0fa01e180c70 (diff)
parent7492752418caef6b4660498a6c27db2ee003793e (diff)
Merge "[automerger skipped] Merge "Update cleanupAppliedPayload comment." into rvc-dev am: 325bbcf799 -s ours am: 1eb6714455 -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions