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

6402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Shih
c09bb48955 libwvhidl@1.3.so: use static libprotobuf 
libwvhidl picked from the following builds
(built from change 20109884):

+--------+--------------+
| arch   | build        |
+--------+--------------+
| arm    | ab/P41744857 |
| arm64  | ab/P41675377 |
| x86    | ab/P41675376 |
| x86_64 | ab/P41675378 |
+--------+--------------+

Ran patchelf to set DT_SONAME to libwvhidl@1.3.so

Bug: 249811494
Change-Id: I1ec8304bab4d81b958b6be056a0b32da386bc997
(cherry picked from commit 6bad0134d3c9ca8d479f121c71d66ac2d3e017b9)
 2022-10-13 00:58:58 +00:00
Alex Dale
5b5c0fd770 Added mutex protection for session_property_set_. am: 381f879ff7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/19561012

Change-Id: Iec56b526fd95cafbd09aae9894796c959924f48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 21:45:05 +00:00
Alex Dale
381f879ff7 Added mutex protection for session_property_set_. 
[ Merge of http://go/wvgerrit/154575 ]
[ Cherry-pick of http://ag/19498242 ]

There is a rare race condition experienced by some Android devices
where the a new client property set is being added while another is
being removed.  The C++ stl library does not provided thread
protection by default.

This CL adds a new mutex for the client property set map which prevents
multiple threads accessing the property sets concurrently.

Bug: 235238226
Test: GtsMediaTestCases on redfin
Change-Id: I32cf11bfb1332295ba1245071102ff0adc35259d
(cherry picked from commit aaa97a5d60)
(cherry picked from commit 6109ec6d66)
 2022-08-10 21:34:32 +00:00
Cong Lin
6d2b371b65 Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324 am: b363f54f9e am: e483932fb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819

Change-Id: I0fcf8b89af94d6db4b69bdf7db4bb65b5c21d45d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:50:16 +00:00
Cong Lin
a3ad7f2719 Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324 am: 7588d0baa1 am: 395251bd90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819

Change-Id: I5111003ccd9181e601bcdff1abcb3761cd3d6ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:49:44 +00:00
Cong Lin
7b52695632 Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324 am: b363f54f9e am: 0698bcdefe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819

Change-Id: I60680a436ee8133ebef3c57f37afaa2b55851162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:49:10 +00:00
Cong Lin
0698bcdefe Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324 am: b363f54f9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819

Change-Id: Id78fb4d41f4d7a9b7e090dec2a1d00952e65ebb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:26:41 +00:00
Cong Lin
e483932fb0 Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324 am: b363f54f9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819

Change-Id: Ib560ed98055a97ccaed658097b12c12577a9449f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:26:39 +00:00
Cong Lin
395251bd90 Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324 am: 7588d0baa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819

Change-Id: If6f3ef93b5e626ebac886ea9606e3e90967da02e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:26:34 +00:00
Cong Lin
b363f54f9e Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819

Change-Id: Ibcdf7c29ad2392a2ee49873aacd5a8f831dbc251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:10:52 +00:00
Cong Lin
7588d0baa1 Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819

Change-Id: I85897585bd72d28afbd11edfcdf4854e758560bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:08:58 +00:00
Cong Lin
8c4c238324 Add unit test for clear KCB in LS SDK 16.4 response 
This is a merge from:
https://widevine-internal-review.googlesource.com/c/cdm/+/152897
and http://go/wvgerrit/153709

Adding a new OEMCrypto unit test will allow partners to correct a
problem earlier in their integration.

Verifies current oemcrypto implementation handles clear KCB in a
mocked 16.4 license response.

Unit test release date updated to 2022-06-17.

Test: run_x86_64_tests; opk_ta
Bug: 235870170
Bug: 234645065
Change-Id: I59fef2c25f5c007624447d4f46147d96adeddad9
 2022-06-17 15:02:09 -07:00
Automerger Merge Worker
393df20ca9 Merge "Allow provisioning model to be queried am: cd593979e9 am: f66cc64bea" into tm-d1-dev-plus-aosp am: 35c95c66c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153

Change-Id: I73c278333abd11159e7086536a351e0e23cc8177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 04:39:42 +00:00
Rahul Frias
3fb8fa19d2 Allow provisioning model to be queried am: cd593979e9 am: 0b780a412f am: 1c3d21f645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153

Change-Id: I65709af91703ecb47743f8e5a61a44f6704736b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 04:39:22 +00:00
Rahul Frias
bf55b83f5a Allow provisioning model to be queried am: cd593979e9 am: f66cc64bea am: d1d77a58ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153

Change-Id: I0ca1252956f10b1957c04e5f1e900fd64a069f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 04:38:54 +00:00
Automerger Merge Worker
35c95c66c2 Merge "Allow provisioning model to be queried am: cd593979e9 am: f66cc64bea" into tm-d1-dev-plus-aosp 2022-05-27 04:23:49 +00:00
Rahul Frias
1c3d21f645 Allow provisioning model to be queried am: cd593979e9 am: 0b780a412f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153

Change-Id: If83cb6a96a3473cf50c1222adf66ceb981bf2e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 04:23:46 +00:00
Rahul Frias
d4a52f47ab Allow provisioning model to be queried am: cd593979e9 am: f66cc64bea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153

Change-Id: I9d01324dc469a3c72be419b7385f93d5f9e3d23d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 04:23:46 +00:00
Rahul Frias
d1d77a58ba Allow provisioning model to be queried am: cd593979e9 am: f66cc64bea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153

Change-Id: I7fa6a53743aa8757ab66edf3e1a75d20dbab15bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 04:23:45 +00:00
Rahul Frias
f66cc64bea Allow provisioning model to be queried am: cd593979e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153

Change-Id: I68d1a67f4b98b74ea7f543101e9a321486ebb22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 04:07:58 +00:00
Rahul Frias
0b780a412f Allow provisioning model to be queried am: cd593979e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153

Change-Id: I941699b085d104d9d5d40dc6220a6539881286fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 04:06:31 +00:00
Rahul Frias
cd593979e9 Allow provisioning model to be queried 
[ Merge of http://go/wvgerrit/152674 ]

This allows an app to query the provisioning model. Possible
values are { "DrmCertificate", "Keybox", "OEMCertificate",
"BootCertificateChain" }

An app can use these to disntinguish between provisioning models.
Provisioning 4.0 (boot certificate chain) requires a double provisioning
step.

Bug: 234057551
Test: WV unit/integration tests, libwvdrmdrmplugin_hal_test
Change-Id: I1611488ec632a0e5a9e1d106b7475e8f5a2a5a13
 2022-05-26 16:22:16 -07:00
Automerger Merge Worker
daad0a9411 Merge "Loosen KCB encryption checks in L3 am: 9935fae50d am: 18eb27fcd4" into tm-d1-dev-plus-aosp am: eb5e32602e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: Ie829c4a55e85ec640a2e6d4bffdb27119224ffb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:44:47 +00:00
Cong Lin
0031791ec8 Loosen KCB encryption checks in L3 am: 9935fae50d am: 9feaf68ea5 am: 196d291162 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: Iaa8d3c0cdad739618721fb976d6d87be78414e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:44:39 +00:00
Cong Lin
adafba08f1 Loosen KCB encryption checks in L3 am: 9935fae50d am: 9feaf68ea5 am: 28ca5aa3cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: I7c2675affa33831095d180da7d0c57d1f26a5d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:44:23 +00:00
Automerger Merge Worker
eb5e32602e Merge "Loosen KCB encryption checks in L3 am: 9935fae50d am: 18eb27fcd4" into tm-d1-dev-plus-aosp 2022-05-22 07:26:04 +00:00
Cong Lin
196d291162 Loosen KCB encryption checks in L3 am: 9935fae50d am: 9feaf68ea5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: I4c6a1c8a181406509f4b3e045a45d852b3ffdd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:26:01 +00:00
Cong Lin
ddc1a24543 Loosen KCB encryption checks in L3 am: 9935fae50d am: 18eb27fcd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: Ic9d17c65f0cdbf280c44447bb70bc94dfd91316e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:26:01 +00:00
Cong Lin
28ca5aa3cf Loosen KCB encryption checks in L3 am: 9935fae50d am: 9feaf68ea5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: I5257ca933846b7b60b2c83046b617a46171421d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:25:59 +00:00
Cong Lin
9feaf68ea5 Loosen KCB encryption checks in L3 am: 9935fae50d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: If52667414b27b20b16c0e84f0b92a906b75b4834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:09:58 +00:00
Cong Lin
18eb27fcd4 Loosen KCB encryption checks in L3 am: 9935fae50d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: Ia4bce27cdc2e18bb7fdedd1eb3640315ac91f875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:08:33 +00:00
Cong Lin
9935fae50d Loosen KCB encryption checks in L3 
This is a merge from:
https://widevine-internal-review.googlesource.com/c/cdm/+/152372

The L3 source change which produced these libraries is:
https://widevine-internal-review.googlesource.com/c/cdm/+/152371/

Original commit message:
To address the bug with certain 16.4.x SDK versions returning a
clear key control block (KCB) for clients newer than 16.5, the
exact version check to determine whether key control blocks are
clear or not has been loosened.

Original behavior:
- ODK version >= 16.5.x --> Assume clear
- ODK version <= 16.4.x --> Assume encrypted
New behavior:
- No KCB IV --> Assume clear
- Otherwise --> Assume encrypted

This CL also includes a change to oemcrypto/include/OEMCryptoCENC.h
The changes to OEMCryptoCENC.h in the CL are comments or variable name
change. So it should be safe.
This change was merged to wv tm-dev here:
https://widevine-internal-review.googlesource.com/c/cdm/+/148411
So, adding it to Android tm-dev.

Test: run_level3_static_tests, CdmDecryptTest/CdmTestWithDecryptParam.* against LS SDK 16.4.2 & 17.0
Bug: 232557453
Change-Id: I2bbb5ab3ea33a16bd6c198077e5aefe960737ea0
 2022-05-22 06:35:22 +00:00
Robert Shih
35de7f5d7f Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5 am: 0ff5a94b18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I82d0e2080fb90cfea9109a70ef6c51a11d0fd8f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 09:16:38 +00:00
Automerger Merge Worker
fb3ac97c6f Merge "Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5" into tm-d1-dev-plus-aosp am: 0089fad7fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: If6bf17d94f836c8ede79f39d6cd7f9718431b846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:22:58 +00:00
Robert Shih
034e8bd518 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: f8bd90fe71 am: 1584175d60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I59919c1f04e8c1e76a5803f8c47f6eae538884c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:22:41 +00:00
Automerger Merge Worker
0089fad7fc Merge "Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5" into tm-d1-dev-plus-aosp 2022-05-16 08:05:37 +00:00
Robert Shih
edfc22c061 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I5aab87e4686521d02b96273c4507ea907281ac17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:05:35 +00:00
Robert Shih
1584175d60 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: f8bd90fe71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I5628a86db0390964d189bbb3748fa574706532fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:05:34 +00:00
Robert Shih
0ff5a94b18 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I4caf1a7412913122341c2d24271036be8bbac357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:05:33 +00:00
Robert Shih
22c314b3c5 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I8bc719c40571d8ecac10a23e982d5a83dd537213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 07:40:55 +00:00
Robert Shih
f8bd90fe71 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I354f65e931b14d00f0f7da7951e94e3a1a89f67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 07:39:39 +00:00
Robert Shih
186e489562 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev 2022-05-16 06:17:33 +00:00
Alex Dale
8709d9322d Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: 11a55d2e8e am: 3b1f15ddee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I0a0f0a12435d572db69c03539f39d354c69da5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 19:07:21 +00:00
Alex Dale
931d425f5b Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca am: c9c8ecd1e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I82817064a5368a1c51abddacca39ba194f913d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 19:06:36 +00:00
Alex Dale
40677ed273 Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca am: 62c43f71d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I4ea1dc01ec99b19d65578d9ab052a0ec423cf2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 19:05:41 +00:00
Alex Dale
3b1f15ddee Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: 11a55d2e8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I85184973cdf55c6ef21729c06c7f9404056657d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:39:53 +00:00
Alex Dale
c9c8ecd1e3 Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I521b19d7a705a28b9c29b27fccb50af1fa027f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:39:36 +00:00
Alex Dale
62c43f71d4 Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: Ia7f7342cb648251893282c56c899f944afd81eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:39:33 +00:00
Alex Dale
e28711c3ca Move system ID extraction outside of CryptoSession. am: 9d169a00bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: Ifa0f6c87c52a3090edc3977d86522163bb68738b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:20:40 +00:00
Alex Dale
11a55d2e8e Move system ID extraction outside of CryptoSession. am: 9d169a00bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: If5782404e3ffff41a2377d6bd2d0a35851f78529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:18:23 +00:00