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-10-07 07:47:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-07 07:47:23 +0000
commit72e83f6f0b25eff73302b277aeda29e6fe99b17b (patch)
treea74a7a831f89e2e7a71359aae316a1a391c04187 /opengl/java/android/opengl/Material.java
parent5e445d124ba1f861d123c82ed8d6971932c74972 (diff)
parent690a1c2960c2c43ea824af27743ec1a124b817e5 (diff)
Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90" into qt-dev am: 2426f27569 am: 8a6fa4c1eb am: 75b7643622 am: 690a1c2960
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966 Change-Id: Ie52ff06a60d72c1179765178eb0ca40d4cf29449
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions