summaryrefslogtreecommitdiff
path: root/native/android/configuration.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-11 22:47:07 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-08-11 22:47:07 +0000
commited52f3108ab0273f990318381f68d2abab7fa544 (patch)
tree0c10eeb6a63a08acf11bae376d4f91f4740b9824 /native/android/configuration.cpp
parentecbc780f809ac73778d829eccedaaf596797ccc6 (diff)
parentf4846a9ae01afac4cac747b25987f52eedbe94bd (diff)
Merge changes from topic "am-3c3f3b161cdd439a9168a2e9eb839962" into udc-d1-dev-plus-aosp
* changes: [automerger skipped] Merge "[RESTRICT AUTOMERGE][pm] Move CtsContentTestCases to postsubmit for pm changes" into tm-dev am: 350219f8d8 am: a70677b933 -s ours am: 51f7eb85e1 -s ours am: 3f385cb073 -s ours [automerger skipped] [RESTRICT AUTOMERGE][pm] Move CtsContentTestCases to postsubmit for pm changes am: e8d244301c am: 043d934f91 -s ours am: 1ce8230dfa -s ours am: 983adfe4cc -s ours
Diffstat (limited to 'native/android/configuration.cpp')
0 files changed, 0 insertions, 0 deletions