summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-29 00:25:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-29 00:25:00 +0000
commitb93a3a001f8d81f9134fee7a1e1e47ad38f74d11 (patch)
tree783574f07a5ec04fa9a35bf1f8b74308d4e0d280 /opengl/java/android/opengl/Material.java
parenta44135d792089d910c2f7aab3b515dd856b3ea9c (diff)
parentc585deeb3f564a4a2724f7f6de022826ccf25cac (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 2b89828ec9 -s ours am: 46d13075b0 -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions