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 19:40:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-27 19:40:19 +0000
commitde068e58c2b65d9c9ae4f0cd28832dd203f78cb2 (patch)
tree7a9287caca34d94b6a32919e014de370639af0a3 /opengl/java/android/opengl/Material.java
parent7f155cc487dada452b5fdc43e14a26be1c91c4ce (diff)
parent7f86ae252c37b5fe087b4ec65ee4bb3f63638424 (diff)
Merge "Merge "Combine startPull and sendHeartbeat threads" into rvc-dev am: a319112cbb am: abe3b8398d" into rvc-d1-dev-plus-aosp am: 7f86ae252c
Change-Id: Ieed2134d14416beb39752b8c02b6a0e613a647f7
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions