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-27 20:00:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-27 20:00:46 +0000
commit977c7b4cdb01944b9c1b62f628c39a14b080c479 (patch)
treed3467b749ec094f6c55839595b73b18c5e5f993b /opengl/java/android/opengl/Material.java
parentf2e44f4cb6bd2e4a8a2852a750f10fefd83347fa (diff)
parent6dc8fc99a140c6c770afd2d13f95b7c514da6e25 (diff)
Merge "Merge "Merge "Combine startPull and sendHeartbeat threads" into rvc-dev am: a319112cbb am: abe3b8398d" into rvc-d1-dev-plus-aosp am: 7f86ae252c" into rvc-qpr-dev-plus-aosp am: 6dc8fc99a1
Change-Id: Id825d887a7de50ec1745c6a8fc4f345ec88121b2
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions