summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorAlison Cichowlas <asc@google.com>2020-06-22 17:04:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-22 17:04:22 +0000
commit1597a9eacf6be4c65d73319160b3c43f716ec57a (patch)
treecf137c08068f0cefe7d096ba2e840d324f14c7ea /opengl/java/android/opengl/Material.java
parent83049ea7214a58e9f8f9f22cd95cf8da42f8fcd8 (diff)
parentc71b0edf6fbf6e060931ee44b33bf08dced6cd06 (diff)
Merge "When Nearby is present as a chip, exclude it from app list." into rvc-dev am: 974d17209e am: c71b0edf6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931365 Change-Id: I028ebbaa2071ccf91e2e9cc95e86b4e44242c360
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions