From 602464869f3e51a872455564edf9838b3d1a31fb Mon Sep 17 00:00:00 2001
From: Ivan Chiang <chiangi@google.com>
Date: Fri, 24 Apr 2020 18:10:58 +0800
Subject: [PATCH] Update prebuilt CTS shim pkgs with the ones built on server

frameworks/base/packages/CtsShim/apk/arm/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/arm/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/x86/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

frameworks/base/packages/CtsShim/apk/x86/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

Built here:
https://android-build.googleplex.com/builds/submitted/6425162/CtsShim_arm64/latest
https://android-build.googleplex.com/builds/submitted/6425162/CtsShim_x86_64/latest

This build is suitable for public release.

Bug: 154025817
Test: presubmit
Change-Id: Ica5c00d37a22c884bcfad6d74358b1379ba08385
---
 packages/CtsShim/apk/arm/CtsShim.apk     | Bin 5428 -> 5430 bytes
 packages/CtsShim/apk/arm/CtsShimPriv.apk | Bin 32068 -> 32069 bytes
 packages/CtsShim/apk/x86/CtsShim.apk     | Bin 5428 -> 5430 bytes
 packages/CtsShim/apk/x86/CtsShimPriv.apk | Bin 24408 -> 24404 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/CtsShim/apk/arm/CtsShim.apk b/packages/CtsShim/apk/arm/CtsShim.apk
index 7bdb2a830d6ff0e96be231fe42e7a7a46b7d6e3f..54ee0d07df3479fa44a51b68d01c0fea873874d2 100644
GIT binary patch
delta 2104
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

delta 2113
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
z000mG000000000000000kdurQBO8BE1yhLx006oM000pH000000000000000%#+F#
rBpVOMSvsfy007DW000yK000000000000000l#>Y+CkECN00000N>mGo

diff --git a/packages/CtsShim/apk/arm/CtsShimPriv.apk b/packages/CtsShim/apk/arm/CtsShimPriv.apk
index 8efd3b248a8827e70e873230bf58e85614ff98c3..ca34af9479861ac4c0fc9c02eb58d9c1d78156b4 100644
GIT binary patch
delta 3559
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

delta 3567
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

diff --git a/packages/CtsShim/apk/x86/CtsShim.apk b/packages/CtsShim/apk/x86/CtsShim.apk
index 7bdb2a830d6ff0e96be231fe42e7a7a46b7d6e3f..54ee0d07df3479fa44a51b68d01c0fea873874d2 100644
GIT binary patch
delta 2104
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

delta 2113
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
z000mG000000000000000kdurQBO8BE1yhLx006oM000pH000000000000000%#+F#
rBpVOMSvsfy007DW000yK000000000000000l#>Y+CkECN00000N>mGo

diff --git a/packages/CtsShim/apk/x86/CtsShimPriv.apk b/packages/CtsShim/apk/x86/CtsShimPriv.apk
index eed29d1a729af55bed407e5386ead8a13f25b1d9..edbb1519eff68cf2b248ee5a24c055509c86b671 100644
GIT binary patch
delta 3564
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

delta 3555
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