Merge cherrypicks of [16049893, 16049894, 16049738, 16049991, 16049805, 16050129, 16049859, 16049992, 16049993, 16049994, 16049806, 16049739, 16050147, 16049257, 16049352, 16049645, 16049258, 16049492, 16050148, 16049493, 16049324, 16049995, 16049740, 16050149, 16049860, 16050130, 16050150, 16049741, 16050131, 16049996, 16049997, 16049714, 16049998, 16050151, 16049646, 16049325, 16050152] into sc-qpr1-release
Change-Id: Id3d7a44eeb387c5853747d227a19b830d60f4e67
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 1b29801..9a41def 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,14 +1,14 @@
drops {
android_build_drop {
- build_id: "7624795"
+ build_id: "7793037"
target: "mainline_modules-user"
- source_file: "mainline-sdks/sdkextensions-sdk-current.zip"
+ source_file: "mainline-sdks/current/com.google.android.sdkext/sdk/sdkextensions-sdk-current.zip"
}
dest_file: "current/current.zip"
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/SdkExtensions"
- git_branch: "sc-dev"
+ git_branch: "sc-qpr1-dev"
transform: TRANSFORM_UNZIP
transform_options {
rename {