summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Tyler Saunders <tylersaunders@google.com> 2024-02-21 17:11:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-02-21 17:11:33 +0000
commit9761b6b2691f614d9e77fec430bee5440e5a35c0 (patch)
tree74ba03816965b56215bbe0cf2fc98c2892c83da9 /opengl/java
parent5d0525f740c2ddbb53b891003adb8b75dc3dc9a6 (diff)
parentc1f15887632528b588f569c1b3977a2b3b6159e1 (diff)
Merge changes from topic "lifecycle-udc-mainline" into udc-mainline-prod
* changes: Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." Revert "Revert "Fix Expandable.kt to work with new Compose prebu..." Revert^2 "Lifecycle has to use kotlin syntax"
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions