Treehugger Robot
a34a7b7550
Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518
am: 368ca264f2
am: fee45b6dbb
am: 546704447e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289
Change-Id: Id84b2996b171486d1a80976d26897580d6fda7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:41:03 +00:00
Zhang Yuan
15668e34c1
Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed. am: 399c257ece
am: ccd929fd64
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469865
Change-Id: I16f56163e96dab73adab0c27dbed1adda4efeb1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:40:51 +00:00
Treehugger Robot
ab53b665ec
Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518
am: 368ca264f2
am: fee45b6dbb
am: 546704447e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289
Change-Id: I535fbce64f38c435fcb57a7b83899ec48b8885f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:40:23 +00:00
Zhang Yuan
eec2cb1d2f
Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed. am: 399c257ece
am: ccd929fd64
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469865
Change-Id: Ib0fea47459e6ba4ceb2572efda7589ca9ceca027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:40:12 +00:00
Treehugger Robot
f70d6537a7
Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518
am: 368ca264f2
am: fee45b6dbb
am: ebd7b7afb8
am: fea8a10a27
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289
Change-Id: I064f01e96a2ba3adce2071b30969ad88ab95c775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:39:37 +00:00
Zhang Yuan
595d51f9c3
[automerger skipped] Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed. am: 399c257ece
-s ours am: 846e734c1d
-s ours am: 336954799f
-s ours
...
am skip reason: Merged-In I3ac7407fdee82348411db99d340613e62f36a277 with SHA-1 5bf6d5777a
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469865
Change-Id: I68835375f11309b268b40e85c01d4be8aeffe621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:37:52 +00:00
Treehugger Robot
fea8a10a27
Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518
am: 368ca264f2
am: fee45b6dbb
am: ebd7b7afb8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289
Change-Id: I8f8898784b7f0fb0b1f315e7c977870377150cd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:01:24 +00:00
Treehugger Robot
ebd7b7afb8
Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518
am: 368ca264f2
am: fee45b6dbb
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289
Change-Id: If81bfd72c984aed3ff5bdd281995413b4825c747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:00:54 +00:00
Zhang Yuan
336954799f
[automerger skipped] Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed. am: 399c257ece
-s ours am: 846e734c1d
-s ours
...
am skip reason: Merged-In I3ac7407fdee82348411db99d340613e62f36a277 with SHA-1 5bf6d5777a
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469865
Change-Id: I476553ae8714fb31cdcf057800b2bfc15a60f7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:59:04 +00:00
Treehugger Robot
546704447e
Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518
am: 368ca264f2
am: fee45b6dbb
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289
Change-Id: Ib09ab19c164af8186f69ea5c4d5e07c541f332a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:38:44 +00:00
Zhang Yuan
ccd929fd64
Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed. am: 399c257ece
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469865
Change-Id: I0fb3ce3f3eee21fe18907d12aa822e4af6c09317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:38:34 +00:00
Treehugger Robot
fee45b6dbb
Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518
am: 368ca264f2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289
Change-Id: I384cfc0e1dc70275f87e10997a29b14225690105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:38:23 +00:00
Zhang Yuan
846e734c1d
[automerger skipped] Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed. am: 399c257ece
-s ours
...
am skip reason: Merged-In I3ac7407fdee82348411db99d340613e62f36a277 with SHA-1 5bf6d5777a
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469865
Change-Id: Ia19e7da2beaa5255da368101f957de3f81d16870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:21:40 +00:00
Xin Li
9e2c92d2bc
[automerger skipped] Merge "Merge Android 13 QPR2" am: 82e0eca1c4
-s ours am: ecfa7523f0
-s ours am: 7205739556
-s ours
...
am skip reason: Merged-In I59ea99e8a1720f61954747f6c29e14cfea9a0f56 with SHA-1 9f788dbed8
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486794
Change-Id: I683c315e57d60763fe8081d4200bc17dd066b3eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:09:06 +00:00
Xin Li
428fca7856
[automerger skipped] Merge Android 13 QPR2 am: 63a85860d0
-s ours am: aaaed18d8c
-s ours am: 88b80ae134
-s ours
...
am skip reason: Merged-In I59ea99e8a1720f61954747f6c29e14cfea9a0f56 with SHA-1 9f788dbed8
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486794
Change-Id: Icfd04f1bb396e93dd17dd9acd107606e76f06573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:06:34 +00:00
Treehugger Robot
368ca264f2
Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289
Change-Id: If47be0aaa310c6e3bbcddeffcc1c2a201654a0f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:01:42 +00:00
Treehugger Robot
333df15518
Merge "Add ATSC support in the vts" into android12-tests-dev
2023-03-14 23:24:36 +00:00
Xin Li
7205739556
[automerger skipped] Merge "Merge Android 13 QPR2" am: 82e0eca1c4
-s ours am: ecfa7523f0
-s ours
...
am skip reason: Merged-In I59ea99e8a1720f61954747f6c29e14cfea9a0f56 with SHA-1 9f788dbed8
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486794
Change-Id: Ia065fcb310d4487d1fd9037b55b11691bee7b224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:08:55 +00:00
Xin Li
88b80ae134
[automerger skipped] Merge Android 13 QPR2 am: 63a85860d0
-s ours am: aaaed18d8c
-s ours
...
am skip reason: Merged-In I59ea99e8a1720f61954747f6c29e14cfea9a0f56 with SHA-1 9f788dbed8
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486794
Change-Id: I75b789e1dc0a3d72d556f395638a1a866c3db88c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:06:29 +00:00
Treehugger Robot
a6b6bb18e2
Merge "Fix RKP support assumptions for keymint VTS" am: f84593a459
am: 298a35f967
am: 82710086e6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469486
Change-Id: Id471cffc96d7995f5b585d186ee374e0d524c31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:02:45 +00:00
stanley-ct.chen
bf2b3e071a
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
am: 34f7b35c46
am: fcc3b6f0a5
am: 7bbdbe8fdd
am: 9a2caf77fd
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: I212f2cd4ef0d3db50c2f79ecd0940fbaef7f970a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:00:11 +00:00
Treehugger Robot
82710086e6
Merge "Fix RKP support assumptions for keymint VTS" am: f84593a459
am: 298a35f967
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469486
Change-Id: Id9d182cc1c470ab57f6a549df6f09cc619ace400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:40:46 +00:00
Xin Li
ecfa7523f0
[automerger skipped] Merge "Merge Android 13 QPR2" am: 82e0eca1c4
-s ours
...
am skip reason: Merged-In I59ea99e8a1720f61954747f6c29e14cfea9a0f56 with SHA-1 9f788dbed8
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486794
Change-Id: Ifb888dbadb62452e6bbd365caa250eb21609d29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:35:19 +00:00
Xin Li
aaaed18d8c
[automerger skipped] Merge Android 13 QPR2 am: 63a85860d0
-s ours
...
am skip reason: Merged-In I59ea99e8a1720f61954747f6c29e14cfea9a0f56 with SHA-1 9f788dbed8
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486794
Change-Id: I055f4cecddc1847d6bbeb60c25ac9c387b0987b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:43 +00:00
Treehugger Robot
298a35f967
Merge "Fix RKP support assumptions for keymint VTS" am: f84593a459
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469486
Change-Id: Ieade1cb739f09732305259446b84a477633d4a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:16:17 +00:00
stanley-ct.chen
9a2caf77fd
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
am: 34f7b35c46
am: fcc3b6f0a5
am: 7bbdbe8fdd
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: I8a1b843387ae10430727c15040a3313f5a3a4a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:00:52 +00:00
Avichal Rakesh
8f4111ca7d
camera: Add logId to StreamConfiguration
...
For data analysis from HAL logs, it is helpful to get some higher level
information of the camera usage (such as the client's package name).
HALs are denied access to this higher level information at runtime.
To help data with data analysis, cameraservice will now pass a session
identifier when configuring streams. This identifier can be used to
correlate HAL logs with cameraservice logs at the time of log
consumption. However this correlation cannot be made at runtime. This
identifier is randomly generated and has no functional purpose and can
be safely disregarded by HAL implementations that don't want to
correlate their logs to cameraservice logs.
Bug: 271171714
Test: Manually verified that cameraservice sends correct logId to the
HAL.
Change-Id: Ib0823a9de8f573233a6e037c178a4398eb26e7ef
2023-03-14 14:45:53 -07:00
Xin Li
82e0eca1c4
Merge "Merge Android 13 QPR2"
2023-03-14 21:40:25 +00:00
stanley-ct.chen
36f26f1ad2
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
am: ce666fc17f
am: fb575962be
am: 34fdf8a830
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: If6a95ecdfd0cdee3a9b37b26a0b3ed976d395001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:27:16 +00:00
Jack Yu
a80f6f7c96
Merge "Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed." am: 86bc150058
am: bc00ee0af0
am: 52e70ec981
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471285
Change-Id: Ic31fd5f850ab50847e896f30952bc6de45db1edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:25:05 +00:00
stanley-ct.chen
7bbdbe8fdd
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
am: 34f7b35c46
am: fcc3b6f0a5
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: I210e87cc5202a3c94fb4f10a90351acc0877f5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:24:56 +00:00
Shunkai Yao
9dcf22d093
Merge "Add some Effect type UUID and offload indicater in common parameter" am: 54cec778ee
am: 7062a4849b
am: 3c7c189ae4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2485228
Change-Id: I2908c76ca911dbd985f0cbfba7d5116c6c938638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:23:13 +00:00
stanley-ct.chen
51b8bb2a32
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
am: 34f7b35c46
am: 107b2fb86b
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: Idec58224de6c18e2454bdb7fbd05d436bedfeaa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:22:22 +00:00
Treehugger Robot
f84593a459
Merge "Fix RKP support assumptions for keymint VTS"
2023-03-14 21:18:37 +00:00
stanley-ct.chen
fcc3b6f0a5
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
am: 34f7b35c46
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: I96cfe63b7bc1bbf3302b67352d02bc535dbe906d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 20:23:56 +00:00
stanley-ct.chen
107b2fb86b
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
am: 34f7b35c46
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: I3dfb3dd9b54946cce1a7a70a7f9190fba3c4d237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 20:23:11 +00:00
stanley-ct.chen
34fdf8a830
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
am: ce666fc17f
am: fb575962be
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: I915bed00ab5e8a5902610742974b8ad3394cb46e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 20:22:34 +00:00
Jack Yu
52e70ec981
Merge "Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed." am: 86bc150058
am: bc00ee0af0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471285
Change-Id: Ia3723dd46fd71cf42d8dcc7b577b2bd2e4f6def7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 20:21:47 +00:00
Shunkai Yao
3c7c189ae4
Merge "Add some Effect type UUID and offload indicater in common parameter" am: 54cec778ee
am: 7062a4849b
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2485228
Change-Id: I6441dcb333b5b1197c06a9f5af76d7b09c190238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 20:21:30 +00:00
ziyiw
617c2baaaa
Add new reason code and status code for session conflict.
...
Also assigned a new number to the UWB regulation off status/reason code.
Test: compile
Bug: 272361935
Merged-In: I4cbf2443d7e3ec914ee465d9128fef5225a74712
Change-Id: Ib219ea213be050944a0bbd601f79ccbbba18f299
2023-03-14 19:58:03 +00:00
Wei
d4dcef21e7
Add ATSC support in the vts
...
ATSC configuration isn't supported in current config reader.
Add it in this CL.
Bug: 271933206
Test: manual
Change-Id: I7a1f5356c33d6576d6ae6c71fd4af171b5ad30ac
2023-03-14 19:51:22 +00:00
stanley-ct.chen
fb575962be
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
am: ce666fc17f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: I6c277abf373167da653a7965138efda619c44ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:44:56 +00:00
Jack Yu
bc00ee0af0
Merge "Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed." am: 86bc150058
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471285
Change-Id: I27cceacc1f5bb58d2348cc484ba0d3ce488bb38f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:44:32 +00:00
Shunkai Yao
7062a4849b
Merge "Add some Effect type UUID and offload indicater in common parameter" am: 54cec778ee
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2485228
Change-Id: I830289ce7701f73956dad7f7b66440dcc8974a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:44:10 +00:00
stanley-ct.chen
34f7b35c46
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: I45b164c723f7e1725185dab8db3a41005dd03488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:42:15 +00:00
stanley-ct.chen
ce666fc17f
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
am: f7bd18c7c6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: I5082637054be9a223f638bdeb87ca9f37a54d893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:26:33 +00:00
Zhang Yuan
399c257ece
Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed.
...
For those devices which does not support GSM, returning is not
supported or invalid arguments are the expected behavior.
Bug: 271642958
Test: atest VtsHalRadioTargetTest
Merged-In: I3ac7407fdee82348411db99d340613e62f36a277
Change-Id: I3ac7407fdee82348411db99d340613e62f36a277
Signed-off-by: Jia Jia <jia.jia@zte.com.cn>
(cherry picked from commit 5bf6d5777a
)
2023-03-14 19:08:46 +00:00
Jack Yu
86bc150058
Merge "Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed."
2023-03-14 19:08:17 +00:00
Shunkai Yao
54cec778ee
Merge "Add some Effect type UUID and offload indicater in common parameter"
2023-03-14 19:01:56 +00:00
stanley-ct.chen
f7bd18c7c6
Fix google vts dead lock am: 33a593ab59
am: 18738f2a5c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486875
Change-Id: I1518cdc4eaa836569ab470edb73ceaa408d8d502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:01:31 +00:00