summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2021-08-10 10:28:27 -0400
committerAlan Viverette <alanv@google.com>2021-08-10 10:28:27 -0400
commit1032661b632ef1325de4c4829008dab8571c346e (patch)
tree6b40d3d55f2a7a2b9bc25b1380b9920790a620f1
parent7f770bcfc83d43216b156d29c38a833a51e4c7e6 (diff)
parent7f7b79075ddbbd486dcd1eb34cb7f78396d15452 (diff)
downloadprotobuf-1032661b632ef1325de4c4829008dab8571c346e.tar.gz
Merge remote-tracking branch 'aosp/androidx-platform-dev-temp' into 191673756_upstream_platformandroidx-window-releaseandroidx-window-extensions-releaseandroidx-window-extensions-core-releaseandroidx-wear-wear-tooling-preview-releaseandroidx-wear-watchface-releaseandroidx-wear-releaseandroidx-wear-platform-releaseandroidx-wear-compose-releaseandroidx-viewpager2-releaseandroidx-versionedparcelable-releaseandroidx-vectordrawable-releaseandroidx-tv-material-releaseandroidx-test-uiautomator-releaseandroidx-sqlite-releaseandroidx-slidingpanelayout-releaseandroidx-resourceinspection-releaseandroidx-profileinstaller-releaseandroidx-privacysandbox-ads-releaseandroidx-preference-releaseandroidx-platform-releaseandroidx-navigation-releaseandroidx-metrics-releaseandroidx-mainandroidx-localbroadcastmanager-releaseandroidx-health-releaseandroidx-graphics-shapes-releaseandroidx-graphics-releaseandroidx-graphics-core-releaseandroidx-glance-releaseandroidx-emoji2-releaseandroidx-drawerlayout-releaseandroidx-draganddrop-releaseandroidx-customview-customview-poolingcontainer-releaseandroidx-credential-releaseandroidx-core-remoteviews-releaseandroidx-core-performance-releaseandroidx-core-core-splashscreen-releaseandroidx-core-core-role-releaseandroidx-core-animation-releaseandroidx-coordinatorlayout-releaseandroidx-compose-material3-releaseandroidx-compose-material3-adaptive-releaseandroidx-compose-g3-releaseandroidx-compose-compiler-releaseandroidx-compose-beta-releaseandroidx-collection-releaseandroidx-benchmark-releaseandroidx-arch-core-release
Bug: 191673756 Test: ./gradlew bOS Change-Id: Icc74c0fb520e24c69bfa861ce969d14bb05e00fc
0 files changed, 0 insertions, 0 deletions