summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorRuslan Tkhakokhov <rthakohov@google.com>2020-04-29 00:40:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-29 00:40:25 +0000
commit85f43453948eae36c9fa9e13199189d3b41de808 (patch)
tree77e2763a96bc26005a088f95dee2a135c686e8ec /opengl/java/android/opengl/Material.java
parentbd009845b53d812d7e12a9eeded47cf3440084ac (diff)
parent4875e8a0dc5a83eae9c0ce7c542f296d3cc5e834 (diff)
Merge "Special-case backup/restore of replaced settings" into rvc-dev am: c3a77a143c am: ade7fb33fd am: 4875e8a0dc
Change-Id: Ib73b93e9d0eed62eb2418fbad6838990c94c8765
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions