summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorKevin Chyn <kchyn@google.com>2020-04-29 04:53:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-29 04:53:43 +0000
commite68ffd35fe7d8db91e201c227517fe3da0f5671f (patch)
tree35377a17392cc7b81b45bcf8bba0b66c83f37cca /opengl/java/android/opengl/Material.java
parent4ff63250de03b930b24c973fe389647461528451 (diff)
parentc42fa2e998e2f038ca7a1577c6ec15c8806b0301 (diff)
[automerger skipped] Merge "Check for null HAT and add logging" into rvc-dev am: 90b27662ed am: 6fdc18adb7 am: c032aadc28 am: 56fbc063f3 am: c42fa2e998 -s ours
am skip reason: Change-Id I7dfe5dd8e740eef0fc74cd2e68a19dc35eb2c49e with SHA-1 a603a30060 is in history Change-Id: I39842f8fdbd57be6c86a53999380483c08671a5d
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions