diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-30 15:15:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-30 15:15:25 +0000 |
| commit | 8bbb1d83cc0e2c36dd87d1ce4e62692977260b3c (patch) | |
| tree | dced568d63381ab425662b7f5f6d4834b1824004 /opengl/java/android/opengl/Material.java | |
| parent | ae86d8a04b84e4395648ee24fc741307089b3b5e (diff) | |
| parent | 6a1089f2081bd02a214d4fd1655fcbef293c8c71 (diff) | |
Merge "[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 31172269d3 -s ours" into rvc-d1-dev-plus-aosp am: 6a1089f208 -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 db6befbd17 is in history
Change-Id: Ie5fd4fd7a00935b82a1e253a190cf3ce3369adcb
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions