diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-08 18:25:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-08 18:25:11 +0000 |
| commit | fd2156fb715e3e6b77089f01ea23cafbbc12d25d (patch) | |
| tree | 1b4ccf9d4cfc6a5475586a1c91ae6bb378b7169a /opengl/java/android/opengl/Material.java | |
| parent | df1b6de06c580d9a5fa86973db7cdd7c88696283 (diff) | |
| parent | e6f539f4f9a82ce012c2f4bfa986836c7221c88e (diff) | |
[automerger skipped] DO NOT MERGE - Merge January 2020 Security Release into master am: 055da6677a am: 01e0d1324c am: e6f539f4f9 -s ours
am skip reason: subject contains skip directive
Change-Id: I6d4b091670291b9557d3cdd07c43317772b622c3
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions