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-08 07:09:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-08 07:09:43 +0000
commit3146a87c4c56f50dcff149291a9f2901ff857cb2 (patch)
treee1e2e34129ad101be5c2262ad2f4fd7190c600c0 /opengl/java/android/opengl/Material.java
parentaaabfc72a46abc3f2abbd175cfe2bf83748101a4 (diff)
parentd61e677f3b3cfb9a49e9fc174ce27abe44b68c5e (diff)
Merge "Merge "MediaRouter2: Sync routes when first RouteCallback is registered" into rvc-dev am: ebb7ae6679 am: 813d77ae44 am: ed1f83f8af" into rvc-qpr-dev-plus-aosp am: d61e677f3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11733427 Change-Id: I13919f35eecc30265257c4fc9c2b1f1cf4971948
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions