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-05-27 19:57:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-27 19:57:31 +0000
commit38caf472b3c9e920425ea3b0e424ca122ed1f18f (patch)
tree55af62f04abe79d9aab42dd666e44f293b143d8c /opengl/java/android/opengl/Material.java
parent0b4db8f6a5ffe79eb1a671d4d11f6e5cb561afdb (diff)
parent330b4f7befda61362b9815e417f1a78a158e5b2b (diff)
Merge "Merge "Enable Sharesheet ranking using PeopleService by default to test in Droidfood" into rvc-dev am: 68348d03e3 am: e6cfca1eb7 am: b6deba719d" into rvc-qpr-dev-plus-aosp am: 330b4f7bef
Change-Id: I4daae026e66c6dcd37fd93285a11ae5bdb597ae7
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions