summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Jordan Demeulenaere <jdemeulenaere@google.com> 2021-11-04 13:40:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-04 13:40:13 +0000
commit0703612270f1f8096b565edf7d649e65675c0720 (patch)
treece8369e384e9f1ec5eb5173c25e800a38dad3e8c /opengl/java
parent0497052427045ac2dc8c1f3176f5b9aecb9316c5 (diff)
parent1cbe36d98bc0a1d0f01c7a321bc27b80e09e2433 (diff)
Merge changes from topic "dialog-aod" into sc-v2-dev am: 94204aa474 am: 1cbe36d98b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16149033 Change-Id: Ic5fd1b95e07a77af0e1cb524101158c69948ca68
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions