Edwin Wong
990a818041
Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868
Change-Id: Ifb08a21ad728b6e03e27b23f772f7d84931f6a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:29:58 +00:00
Edwin Wong
ba8e028d3b
Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868
Change-Id: I7967755fcea35ab9518d9f640a4fdf3dfb110e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:29:55 +00:00
Edwin Wong
db1484cf56
Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 8cc0db4a89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868
Change-Id: I414efe4d3f25f1af4bfb68ff82202abb95cd37b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:29:11 +00:00
Edwin Wong
67522b7b65
Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868
Change-Id: I2f20175c6204807803a0745de0d47e06e8042fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:10:44 +00:00
Edwin Wong
8cc0db4a89
Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868
Change-Id: I6ad4d5573686317a4d1aece16f9136936dbc8faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:09:34 +00:00
Edwin Wong
e277ac0aaf
Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868
Change-Id: Ic0e965c34364ace57f6b10b8ddbaf637b954d1a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:09:13 +00:00
Edwin
c6595a1da2
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 am: 2305263b2d am: 26d232ada4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: Ieb45861241c2f7f5a0c14a9298a6d0da0277eec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 01:23:50 +00:00
Edwin
8ce16b419f
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 am: c4d06d6ea6 am: e8a63dc927
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: If81cff2e33800f110f707b8d96e0cef5c6a96e2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 01:03:46 +00:00
Edwin
26d232ada4
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 am: 2305263b2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: Ic3cbaa0f2989f7a5d328edd4db1299e1db7378ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 00:33:28 +00:00
Edwin
e8a63dc927
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 am: c4d06d6ea6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: I121f0077b533b98444593f52deb465b35495ffa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 00:32:02 +00:00
Edwin Wong
cf3771e54a
Add hal_metrics_adapter_unittest for AIDL service.
...
[ Merged from http://go/wvgerrit/151750 ]
Test: m hal_metrics_adapter_unittest -j128
Test: m hal_metrics_adapter_unittest WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/hal_metrics_adapter_unittest /data/nativetest/.
Test: adb shell LD_LIBRARY_PATH=/vendor/lib64 /data/nativetest/hal_metrics_adapter_unittest
Bug: 217247987
Change-Id: I0c890d2fab754bf993632659293a0272c863b11f
2022-05-11 22:01:35 +00:00
Edwin
2305263b2d
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: I59bc66217b8170a2ad369732bbb8ac6e4dcf4fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 21:40:42 +00:00
Edwin
69de482038
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 56594f7018 am: c31ba7f4ff am: 0d86212819
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: I5a83f404024875b444e1fc6e9eb28bf7af8c3d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 21:30:44 +00:00
Edwin
c4d06d6ea6
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: Ieb328c30bd47b7863b614ed8c451507f60d9b704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 21:30:43 +00:00
Edwin
0d86212819
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 56594f7018 am: c31ba7f4ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: I3e633b4f8edde38ef56e26999a82f0aae4519b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 21:01:03 +00:00
Edwin
9586d34201
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: Idc534a847bf4d3a592fc0217178b8e1740e9ab21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:55:27 +00:00
Edwin
23f99c6703
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 8089519493
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: If2c6d9cbaba5e8ba5fcb3e523fbdb6379df2ecc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:37:41 +00:00
Edwin
c31ba7f4ff
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 56594f7018
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: Ifdd79ef8b1b8b7de61da5d26861f4e7d57b62e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:36:56 +00:00
Edwin
8089519493
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: I0d15e53dd83e507f840731f74590c7f6a43103fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:19:32 +00:00
Edwin
56594f7018
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: I6d8b16e2da6c3a4fa96f699f2dcdcf2e3de21271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:18:35 +00:00
Edwin
5202862e9a
Add libwvdrmdrmplugin_hal_test for AIDL service
...
[ Merged from http://go/wvgerrit/150769 ]
- remove OpenSessions_1_1, only applies to hidl
- move plugin and mCdm creation in SetUp() test fixture
- reset plugin and mCdm smart pointers in TearDown
- reduce code duplication
- remove MockDrmPluginListener, send*Event has gone private
Test: m libwvdrmdrmplugin_hal_test -j128
Test: m libwvdrmdrmplugin_hal_test WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/libwvdrmdrmplugin_hal_test /data/nativetest/.
Test: adb shell LD_LIBRARY_PATH=/vendor/lib64 /data/nativetest/libwvdrmdrmplugin_hal_test
Bug: 217247987
Change-Id: I8bc0a390a88facbc890cf26872fd089afe87850a
2022-05-11 05:36:40 +00:00
Robert Shih
97991cfd30
Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e am: 4d928c4906 am: fe8fbeae37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386
Change-Id: Id43e2caa6ed553af61c5e8e3c2216999630cb108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 03:50:39 +00:00
Robert Shih
25960f364c
Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e am: f5a65bec87 am: ea913d0b3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386
Change-Id: I8df388da1ca3c32e25cb1be1ade54b4458a0b808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 03:47:49 +00:00
Edwin Wong
7a92ff46f5
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413 am: 0d71f292ac am: 62e7b8f855
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: I8eca0281ccdd29959ea77ed2f41395dd5c001797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 03:46:37 +00:00
Edwin Wong
d1315dc658
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: cba60f02a9 am: 310347ff63 am: 1c2455efa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: I2d8325aa3a2594c1f1127b4caba408555574fe1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 03:42:38 +00:00
Edwin Wong
186ed51462
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413 am: 900cf7bf2e am: 9c23a58b07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: I519ff6ece01b7464a28cc379b012f1125ae9f478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 03:33:30 +00:00
Automerger Merge Worker
d668c5c52f
Merge "Added CDM support for production readiness reporting. am: cd5afa88a6 am: 867954b412 am: 72eeca4e98" into tm-qpr-dev-plus-aosp am: 822fe79ab8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696
Change-Id: I9fed355c6d2f145c0d0de740f6360202490c44e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 03:12:28 +00:00
Alex Dale
3e40d9a9f8
Added CDM support for production readiness reporting. am: cd5afa88a6 am: 6fe5fe9b47 am: 3aa2a55386 am: d98dc4f92e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696
Change-Id: I2791b765785b0fb7ff1aa1ccd96ae254054d0a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 02:54:18 +00:00
Alex Dale
7ea706e1e4
Added CDM support for production readiness reporting. am: cd5afa88a6 am: 867954b412 am: 1f9bb0ca5e am: d7eea27a9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696
Change-Id: I7a77f4125f136233469fb06de70dec392007f353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 01:44:47 +00:00
Alex Dale
88a7ff7685
Added metrics for production readiness.
...
[ Merge of http://go/wvgerrit/151749 ]
Extended CryptoSession for recording the result of
OEMCrypto_ProductionReady().
Only OEMCrypto_SUCCESS is considered "production ready". With the
exception of OEMCrypto_ERROR_NOT_IMPLEMENTED, any other result is
vendor-specific and indicates not being production ready.
Bug: 231655151
Test: metrics_collections_unittest
Change-Id: Ia0e5603d7ee1290238cce63d0194ae1aced424c1
2022-05-10 18:04:11 -07:00
Robert Shih
ca2440f556
dumpsys widevine: print hex IDs to avoid garbled text
...
Includes minor format change for easier ingestion by other tools.
Bug: 231677822
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine
Change-Id: Ibd13c84bd8f93ea0fc6cbd38b56ef39541ecc867
2022-05-11 00:50:11 +00:00
Robert Shih
fe8fbeae37
Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e am: 4d928c4906
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386
Change-Id: Ieed12d1edc37a73011ee5976b181cd906533fc72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:42:20 +00:00
Robert Shih
ea913d0b3a
Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e am: f5a65bec87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386
Change-Id: If42eac8ffc9572e3456b1a78f0a77b00ba705aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:42:03 +00:00
Robert Shih
4d928c4906
Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386
Change-Id: I79b5410b3ca4afa015c4f4fef4c63f36c470d2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:25:16 +00:00
Robert Shih
f5a65bec87
Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386
Change-Id: Ife931e549deb37776967e6932eb1a23da5ed5495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:25:15 +00:00
Edwin Wong
62e7b8f855
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413 am: 0d71f292ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: Ib3970251527802f8fc4806d09bf73e937b9639ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:15:42 +00:00
Edwin Wong
1c2455efa4
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: cba60f02a9 am: 310347ff63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: I03256162d7ddfef674c298b3e66a3d434d383d00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:15:30 +00:00
Edwin Wong
9c23a58b07
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413 am: 900cf7bf2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: Id22b09023fcbda2852fa2563faf28b7db97cd270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:15:03 +00:00
Robert Shih
63ad411c0e
Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev
2022-05-11 00:10:36 +00:00
Edwin Wong
900cf7bf2e
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: Id8041755dd4685c8f7d33f4e014cfcf97cdeddad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:51:43 +00:00
Edwin Wong
0d71f292ac
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: Ib2878aeb966a701e758805877969e02a4d332951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:51:42 +00:00
Edwin Wong
310347ff63
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: cba60f02a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: Iec6f953fb2e7bd96fd2f133661d25a56b77f4cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:42:41 +00:00
Edwin Wong
adcc64a81e
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: e7fc768561
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: Iae9e64a6e3894dd335e564390483e23e887d95df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:41:53 +00:00
Edwin Wong
2054705413
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: I836dd3e5a995d261133c73e99137078827d0f680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:25:36 +00:00
Edwin Wong
e7fc768561
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: I9e178ea105015385ca5fe2c150b8f4aff273501c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:24:40 +00:00
Edwin Wong
cba60f02a9
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: I4a3a7fa6a4ae632f9deb42e51fc7ee1e5aa8c71c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:23:59 +00:00
Edwin Wong
f8146ee716
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev
2022-05-10 23:12:05 +00:00
Automerger Merge Worker
822fe79ab8
Merge "Added CDM support for production readiness reporting. am: cd5afa88a6 am: 867954b412 am: 72eeca4e98" into tm-qpr-dev-plus-aosp
2022-05-10 22:56:44 +00:00
Alex Dale
70ff0dbb90
Added CDM support for production readiness reporting. am: cd5afa88a6 am: 867954b412 am: 72eeca4e98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696
Change-Id: I6c124810d28152cf2affe9b2b466bd61bf1fa4ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 22:56:41 +00:00
Alex Dale
d98dc4f92e
Added CDM support for production readiness reporting. am: cd5afa88a6 am: 6fe5fe9b47 am: 3aa2a55386
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696
Change-Id: I7fb378063ae765c88ed75bbbb494893553140f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 22:56:39 +00:00