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-06-23 00:07:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 00:07:09 +0000
commitfff9b125e48f2ef87d5fbd1f9c6cfd6152e8aeb2 (patch)
treeb387cfc4fe26dfbb647707dcf216ee592510d49c /opengl/java/android/opengl/Material.java
parent7ef0d0bc8f1beb79ce547c8888b75a0019411e5f (diff)
parentb2ecdf7215b08f6b07ec09ab83cc269b0cbf2111 (diff)
Merge "Merge "Fix issues with bubbles crashing/removing during expansion." into rvc-dev am: 7bf84ecb6a am: 45b21261cb am: 97a8edc72f" into rvc-qpr-dev-plus-aosp am: b2ecdf7215
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11960744 Change-Id: I941b5667202f18583512ece34f430f7710ea34ac
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions