diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-13 02:14:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-13 02:14:40 +0000 |
| commit | a8bd2d024ca7f9550f869aa979021859a0d345d6 (patch) | |
| tree | 6e574ca310ec2e0e0a3cb8b7d17d82378cac18b1 /opengl/java/android/opengl/Material.java | |
| parent | b22bec5c0a6517461a45616bca0a547a790073a6 (diff) | |
| parent | e34560aee46c8fcc6934b8b547debb264557a2a6 (diff) | |
Merge "Merge "Fixed AAAPlusPlusVerifySysuiRequiredTestPropertiesTest broken by missing annotation in CarKeyguardViewControllerTest." into rvc-dev am: 1223fab4b7 am: b1c9548fec" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions