diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-31 07:15:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-31 07:15:54 +0000 |
| commit | 2e899c8cf72e14d2909cac46cd1eeec125df0252 (patch) | |
| tree | 82dfc67a76c93a006a223459c150866663d6c1c3 /opengl/java/android/opengl/Material.java | |
| parent | 38a20c632f13dc83a9224ed4d1632912f18a3dd3 (diff) | |
| parent | 7088ab4e14147b607a07fcea6852c84a224afe7a (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 641c4d04fb -s ours am: 99e4e4d810 -s ours" into rvc-qpr-dev-plus-aosp am: 7088ab4e14 -s ours
am skip reason: subject contains skip directive
Change-Id: I0ccf4e1b3734512b9f571b434034add603f8e261
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions