[automerger skipped] Merge "DO NOT MERGE Designate udc-dev* branches as UDC." into udc-dev am: fb48efce74
am: f207276dd6
-s ours
am skip reason: Merged-In If49ce93abe63ad4e624a00454fcb3aa712f2d976 with SHA-1 fe63f28bd9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24816359
Change-Id: I3276ca22eec4eac5c6ebadcb70e51e4f5a992418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: