summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-13 02:14:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-13 02:14:29 +0000
commite34560aee46c8fcc6934b8b547debb264557a2a6 (patch)
tree6e574ca310ec2e0e0a3cb8b7d17d82378cac18b1 /opengl/java/android/opengl/Material.java
parentbfd9137fe9e9e134a217027ff61a6be1193fcd18 (diff)
parentb1c9548fec64935e66cb4db202e5e80bba6a5340 (diff)
Merge "Fixed AAAPlusPlusVerifySysuiRequiredTestPropertiesTest broken by missing annotation in CarKeyguardViewControllerTest." into rvc-dev am: 1223fab4b7 am: b1c9548fec
Change-Id: I2aafbda01ee20ba383d1dae0f3d7d78c3313f4cb
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions