summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2020-06-22 19:21:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-22 19:21:38 +0000
commit2e99900a69d3ea8d46fd5d23de64071cd7b3af78 (patch)
tree66823ebc1adc32e20831f32868b7207edc9ff29b /opengl/java/android/opengl/Material.java
parent49d6ea0b3a3c3f073631f85f9ff19a4aa15ec5a4 (diff)
parent29dcf2ef54cc020b75452cbe49dab8cc43ae97f4 (diff)
Merge "Making the media carousel dismissable" into rvc-dev am: 82359e319e am: 2001debcdf am: fbb63aee92 am: 29dcf2ef54
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885872 Change-Id: I030012bddc6e8701ad073ce2eef9f794a97dd7b5
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions