summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorInseob Kim <inseob@google.com>2020-05-13 05:30:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-13 05:30:58 +0000
commit618c42aff8960075b372f5e9473268883d85da78 (patch)
tree665fb7c8a87ab4ac05e4e429944b99541194e22c /opengl/java/android/opengl/Material.java
parentf886837e8c12a25b4873ad80312c64ef46997ef8 (diff)
parent8c6c662e7b41dd51bec7ed5f6a9e37f534a9e368 (diff)
[automerger skipped] Merge "Remove sys.vdso property" am: bb11b35c03 am: eb2de8cdea -s ours am: e4ce4b062d -s ours am: 8c6c662e7b -s ours
am skip reason: Change-Id Ibb09e17703fbc95fe41542d335311b68553502a0 with SHA-1 dfafe03cb4 is in history Change-Id: I5179a6e705c1a7bcf5ca8ea8b2c07332be500f3d
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions