summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorMatt Pietal <mpietal@google.com>2020-05-13 03:03:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-13 03:03:41 +0000
commit81994adca3e74966e34caf959b29471cc9f6d41b (patch)
tree4426c300246c40e9e00e80f49c7f36be42ae4b9d /opengl/java/android/opengl/Material.java
parent712d7dcdf5322cfdb5ca935a36a36a1bc7f2ed7b (diff)
parente66d337f2a965b32a80c44893704eb9a43075275 (diff)
Merge "Controls UI - Only show controls after device is setup" into rvc-dev am: fb3ee92087 am: 76df08298e am: e66d337f2a
Change-Id: I0a9f30bfa3f3f27c7fa1b8b3184445903ef49fb5
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions