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