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:51:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-29 04:51:09 +0000
commitad5e661e6605a6cc6c0119b90c6bfa4e5c38118b (patch)
tree8fba0aa05deb833c84a4d116453fced31391ca39 /opengl/java/android/opengl/Material.java
parent828aa8c863df1074ac02cccc61903293eb11f507 (diff)
parent9f21c36edb17155b614e71023df48be9a2a58eaf (diff)
[automerger skipped] Merge "Merge "Check for null HAT and add logging" into rvc-dev am: 90b27662ed am: 6fdc18adb7" into rvc-d1-dev-plus-aosp am: 158066f777 am: 9f21c36edb -s ours
am skip reason: Change-Id I7dfe5dd8e740eef0fc74cd2e68a19dc35eb2c49e with SHA-1 a603a30060 is in history Change-Id: I744e074da90157a33b5a6530487fd2914097f14f
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions