diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-31 07:14:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-31 07:14:59 +0000 |
| commit | 3a2a1abc921e3a5721f881f487d710b89ad7e573 (patch) | |
| tree | 82dfc67a76c93a006a223459c150866663d6c1c3 /opengl/java/android/opengl/Material.java | |
| parent | f2fb2ae444591423b541be0874a993a4bcc9a4b7 (diff) | |
| parent | 92ed142797670525bae97280305d6d490192c14e (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: efbfbe08cb -s ours am: c1fe45fae5 -s ours am: af67eeff05 -s ours" into rvc-qpr-dev-plus-aosp am: 92ed142797 -s ours
am skip reason: subject contains skip directive
Change-Id: If275b6cd2ab88ef4239ed1dc3035af5ee9b491c3
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions