commit | ebaafc1405d1c9d4ee628eb89f2a53a04ea871de | [log] [tgz] |
---|---|---|
author | Nikita Ioffe <ioffe@google.com> | Sat Jul 29 02:02:39 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 29 02:02:39 2023 +0000 |
tree | 4994d1138434858bc28b5dd2779de68a1882fcda | |
parent | a30cd94ae1d7e3275448d0bcdffe5eb5e6e61539 [diff] | |
parent | 28e5a529814948c50c18f665bacaa41123d5cb0c [diff] |
Merge changes from topics "cherrypick-non-staged-flag-ussa3zkzzhp", "forced-non-staged-apex-update-udc-dev-plus-aosp" into udc-dev-plus-aosp am: aff194604f am: 28e5a52981 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24224464 Change-Id: I467e1329bc214efdc42134983168a1b22156480d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>