diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-31 07:15:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-31 07:15:23 +0000 |
| commit | 38a20c632f13dc83a9224ed4d1632912f18a3dd3 (patch) | |
| tree | 82dfc67a76c93a006a223459c150866663d6c1c3 /opengl/java/android/opengl/Material.java | |
| parent | 3a2a1abc921e3a5721f881f487d710b89ad7e573 (diff) | |
| parent | 7903adce2524aee01ff6cac9a8bbaac0c932e0de (diff) | |
Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: efbfbe08cb -s ours am: 4ce9a49fa7 -s ours" into rvc-d1-dev-plus-aosp am: b74fd73231 -s ours" into rvc-qpr-dev-plus-aosp am: 7903adce25 -s ours
am skip reason: subject contains skip directive
Change-Id: I27b0eb53d3e0b0a9a38b4913d04315746e7c5f98
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions