widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,328 Commits 2 Branches 0 Tags
e8a63dc927ed1ce66bd04fe35299a9031ae4c78c
Commit Graph

6328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
1069ae39cc Resize OEMCrypto buffer-based results on success. 
[ Merge of http://go/wvgerrit/151191 ]

Within the CDM and OEMCrypto tests, there were a few OEMCrypto function
calls where the final size of the output buffers were not being
resized.  For several of these functions, an initial call is made with
zero-length output buffers, expecting OEMCrypto to return
ERROR_SHORT_BUFFER; followed by a call with buffers at least as large
as specified by OEMCrypto.  However, for some operations, OEMCrypto
makes an estimate on the final size on the first call, specifying the
exact size only after performing the operations.

This is the case for the wrapped key returned by
OEMCrypto_LoadProvisioning().  The provisioning response contains a
padded + encrypted DRM key.  OEMCrypto does not know the actual size
of the key until decrypted, and the actual DRM key might be smaller.

There was a OEMCrypto test for OEMCrypto_BuildInformation() which
was enforcing the wrong behaviour.  This has been updated.

Bug: 230661565
Test: oemcrypto_test
Change-Id: Iad297d56ffbb085894641fdf8698ce5fd18edbf2
 2022-05-04 21:32:08 -07:00
Vicky Min
69e917dc7e Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 am: ab3ee4d73c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I3915b9b336b87ccfc4e70303b73a4ea6bba05ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:56:47 +00:00
Vicky Min
55ce026a86 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: 9c122a40ea am: edcd9fe9f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I8614f5b491d2511a0b74705417097f9d2da8442f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:56:41 +00:00
Vicky Min
a0f6b925ac Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 am: 788614559b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I1e63f4b32d820799b72c85c032ecb0f447bf5907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:56:30 +00:00
Vicky Min
788614559b Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I1024b14f78693474e3884390ba8818f3e3a5429f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:35:12 +00:00
Vicky Min
ab3ee4d73c Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I9228c47fe7d301029bc17aa2f8f5f00e0cad0376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:35:09 +00:00
Vicky Min
edcd9fe9f1 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: 9c122a40ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I05d17d0d374871c5d9dbb81cc60954cb1c771186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:35:00 +00:00
Vicky Min
ad7a07b234 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I8632a274c3ca239b4342a639d3566214a54dd689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:10:57 +00:00
Vicky Min
9c122a40ea Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I8de55fc7626dec605b18b5ccc1de1d51c65efed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:09:39 +00:00
Vicky Min
1563fb2a27 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() 
In TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths(),
LoadResponse() should be called after EncryptAndSignResponse() so this
is moved in this CL.

Bug: 231368221
Test: OEMCryptoMemoryLoadLicense tests
Change-Id: I7a0224afb21c3ab1d896ce3cfb64e1ad544a581a
 2022-05-03 23:36:05 +00:00
Fred Gylys-Colwell
2899924d42 Update TestMaxDRMKeys to use 2048 bit keys only 
Merge from Widevine repo of http://go/wvgerrit/151254

Test: Ran tests on reference oemcrypto
Bug: 228996670
Change-Id: I6ea69bad49fa2d4272fc8bb02895c17f314c7f49
 2022-05-02 17:36:36 -07:00
Fred Gylys-Colwell
0d6fbb2d0e Restrict CAS unit tests to devices that support CAS 
Merge from Widevine repo of http://go/wvgerrit/151253

This updates the OEMCrypto unit test filters to remove
CasOnly tests if the device does not implement the cas
function OEMCrypto_LoadCasECMKeys.

Test: unit tests on Luci
Bug: 221256887
Change-Id: I7026c4318153ada1d85055704e87b2cef397ffca
 2022-05-02 15:41:52 -07:00
Lu Chen
534589fd2e Include SPOID in provisioning 4 request 
Merged from https://widevine-internal-review.googlesource.com/148554

This change was merged to master but missed in tm-dev when we stopped
the auto merging to tm-dev. Manually cherry picked it.

Test: ran OPK unit tests
Bug: 230820162
Bug: 180530495

Change-Id: Ib23f07f84096650beb4dd1950105db01e004d484
 2022-04-29 21:36:51 -07:00
TreeHugger Robot
02110310d5 Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 am: addc7921ce am: 5c089b687d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: I602e7c62027258a0b24544276bc74df1f9d39fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 22:31:17 +00:00
TreeHugger Robot
e71dd72b95 Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 am: 0657c15214 am: 4d2d355983 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: Id4829c9a0cfaa72f899dd309954098752e42240c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 22:03:08 +00:00
TreeHugger Robot
ba1f978083 Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 am: addc7921ce am: 1609468f39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: Iea6569c34de3889b6c08b6f62ca8a8ac2ec3fa44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 20:29:42 +00:00
TreeHugger Robot
5c089b687d Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 am: addc7921ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: Icd408f6bf4212c75380adf09a48008fafc84893f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 20:13:26 +00:00
TreeHugger Robot
4d2d355983 Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 am: 0657c15214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: I52e282400d629b5964db5fb72dcc5ec5a4bd9246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 20:12:21 +00:00
TreeHugger Robot
1609468f39 Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 am: addc7921ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: I4da5d7f9260eeeb6542587ae09ed55d411d9b300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 20:12:15 +00:00
John Bruce
8289cbb34b Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 48a64d2240 am: 5ebb827ecf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I163edf52cae2010ad06022c0316f7b270e4afff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 20:00:06 +00:00
John Bruce
c3ad3e4fa7 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 22d2ba8bf1 am: 4812f775d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I64139a272b74d536f108b128d0d2d035d9d267ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:58:56 +00:00
TreeHugger Robot
addc7921ce Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: Ie9cdc9f0ea3e2ee6582f537f980bf55e94a10d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:56:05 +00:00
TreeHugger Robot
0657c15214 Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: I97b0a7e61e52d14135e2ddd29e56da410cb88015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:54:44 +00:00
Alex Dale
80bd86d037 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: e4cb3e49b1 am: adff500240 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: I066824f901434d11d81a9d742846c3a2c99b5be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:51:09 +00:00
Alex Dale
8303c22052 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: cae67a0b19 am: 05c41a56be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: I78cfaaeebd9b18cf7c766d2a567980f819090921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:45:11 +00:00
TreeHugger Robot
da1e3c5de2 Merge "Added mutex for reserved_license_ids_." into tm-dev 2022-04-29 19:36:30 +00:00
John Bruce
5ebb827ecf Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 48a64d2240 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: Id57a18e8d34d0ab41afa16b825242d4a591f8c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:19:27 +00:00
John Bruce
4812f775d8 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 22d2ba8bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I28d73f99f951a7ac37607c97c0cc98f9bf264961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:13:24 +00:00
Alex Dale
adff500240 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: e4cb3e49b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: I4362428aab8ee1b5ba0cbaa6ea635cd17d9f10d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:03:45 +00:00
Alex Dale
05c41a56be Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: cae67a0b19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: If611de42b11d4b61fcf0cb384d0d2b4d96c621be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:52:29 +00:00
John Bruce
8201d91231 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 22d2ba8bf1 am: 8db98d1bc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: Ib97df795cd954fde73758d6fdc2747eb18c26672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:44:34 +00:00
Alex Dale
538904dec9 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: e4cb3e49b1 am: f9fc3e3828 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: Ibc75216e73374903c9864cc66f3119d8341add99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:43:25 +00:00
John Bruce
8db98d1bc9 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 am: 22d2ba8bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I0e4e6046ceea13b6b77206a11ddb837748476d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:25:18 +00:00
Alex Dale
f9fc3e3828 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 am: e4cb3e49b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: Ia18a4ab7636e253cef5f27ccc21a4e63ff90f85b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:24:33 +00:00
John Bruce
22d2ba8bf1 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I20a06b97e6cd2a97b688c744a73981fbe4c98700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:05:10 +00:00
Alex Dale
e4cb3e49b1 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: Ib0903a3afd461b8d053a5bbcc10533bd74f1f22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:02:27 +00:00
John Bruce
48a64d2240 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev am: 7d78ce9ac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17949160

Change-Id: I8497ffcc5af5f19727fdf5ff0b8d5034994e0f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:01:50 +00:00
Alex Dale
cae67a0b19 Merge "Specify DRM certificate duration in tests." into tm-dev am: 38b639f920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17779678

Change-Id: Ie78be345758fc67e01f185a01fe91119abfb61e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:00:18 +00:00
John Bruce
7d78ce9ac8 Merge "First-stage Provisioning 4.0 client ID encryption" into tm-dev 2022-04-29 17:38:39 +00:00
Alex Dale
38b639f920 Merge "Specify DRM certificate duration in tests." into tm-dev 2022-04-29 17:34:59 +00:00
Robert Shih
9cd58c8832 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 71a89e2daa am: 7c8c12797a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Ic3eb8121cbe002ed75f05306c8910886750195a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:15:47 +00:00
Robert Shih
b7ca3947e6 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: 022c86d666 am: 9a66b5a614 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I7cbfbb33befb785c0a50ef49bb4b70d7cc3c1226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:15:34 +00:00
Robert Shih
02a3668fc8 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c am: 965a198106 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Ifccaea031bb21f4a47b33cd4c1a2ce75e033735a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:15:08 +00:00
Robert Shih
f65d971118 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b am: 34d9771f06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: Ie929c02c8e5e258922e7e3b33cbedaffc57ed6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:14:15 +00:00
Robert Shih
aee8d5f57e Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c am: dbf6986c98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I2c99174f69063d88d7f8138b35ae6c2fd699ed7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:13:33 +00:00
Robert Shih
cad8ff6aab Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: fbec9a1c8b am: 6b54740110 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I0477dc3a81c18cee2971695ed99444e58ec12a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:13:26 +00:00
Robert Shih
7c8c12797a Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 71a89e2daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Id29cc4e198a89e52ddc88f91a1b9343850d871af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:11:14 +00:00
Robert Shih
9a66b5a614 Merge "Widevine PRODUCT_PACKAGES makefiles" into tm-dev am: 3b44c810d6 am: 022c86d666 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17133103

Change-Id: I884a2db9719e069705e1ee422aa694ed3926dd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:10:49 +00:00
Robert Shih
965a198106 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: Icb1e0942b54fa39ffb541b22a04d0ab2ead8e917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:09:13 +00:00
Robert Shih
dbf6986c98 Merge "WVCdm: no destroy global log buffer on exit" into tm-dev am: 5c38b38514 am: 470f49f87c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17570520

Change-Id: I61adb53f7b9303fdd305596b138892ef6d18de9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:09:11 +00:00