Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 600d28c2 authored Mar 15, 2021 by Treehugger Robot Committed by Automerger Merge Worker Mar 15, 2021

Merge changes from topic "b174856119_aosp" am: 53455cd1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629262

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc6a8afcef7cb7e9af55534450afed15fce023b1

parents b37e4bcc 53455cd1

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShimPriv_apk.asciipb

+2 −2

Original line number	Diff line number	Diff line
		drops {
		android_build_drop {
		build_id: "6508977"
		build_id: "7197701"
		target: "CtsShim"
		source_file: "aosp_arm64/CtsShimPriv.apk"
		}
		@@ -8,5 +8,5 @@ drops {
		version: ""
		version_group: ""
		git_project: "platform/frameworks/base"
		git_branch: "rvc-dev"
		git_branch: "sc-dev"
		}

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShim_apk.asciipb

+2 −2

Original line number	Diff line number	Diff line
		drops {
		android_build_drop {
		build_id: "6508977"
		build_id: "7197701"
		target: "CtsShim"
		source_file: "aosp_arm64/CtsShim.apk"
		}
		@@ -8,5 +8,5 @@ drops {
		version: ""
		version_group: ""
		git_project: "platform/frameworks/base"
		git_branch: "rvc-dev"
		git_branch: "sc-dev"
		}

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShimPriv_apk.asciipb

+2 −2

Original line number	Diff line number	Diff line
		drops {
		android_build_drop {
		build_id: "6508977"
		build_id: "7197701"
		target: "CtsShim"
		source_file: "aosp_x86_64/CtsShimPriv.apk"
		}
		@@ -8,5 +8,5 @@ drops {
		version: ""
		version_group: ""
		git_project: "platform/frameworks/base"
		git_branch: "rvc-dev"
		git_branch: "sc-dev"
		}

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShim_apk.asciipb

+2 −2

Original line number	Diff line number	Diff line
		drops {
		android_build_drop {
		build_id: "6508977"
		build_id: "7197701"
		target: "CtsShim"
		source_file: "aosp_x86_64/CtsShim.apk"
		}
		@@ -8,5 +8,5 @@ drops {
		version: ""
		version_group: ""
		git_project: "platform/frameworks/base"
		git_branch: "rvc-dev"
		git_branch: "sc-dev"
		}

packages/CtsShim/apk/arm/CtsShim.apk

+54 B (5.36 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file