Commit Graph

848600 Commits

Author SHA1 Message Date
Jing Ji
c44e0d67b0 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30b8 am: e6bfe173ca -s ours am: 50e469e8ff -s ours am: c8640975fb -s ours am: 1a7f933b02 -s ours am: 8442f15b5e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: Ice2ae5b31391cd817adae44892567f9e9b6af501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 00:10:04 +00:00
Jing Ji
889de9f402 Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0dd am: 673ddf6188 am: b41a54fdc3 am: c762b28c29 am: b9dae8576b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: I1e3d1fca8219f50d0930b67ebc475922b2a41a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 00:09:17 +00:00
Jing Ji
076ca82a28 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e am: b1003d47de -s ours am: 434c657230 -s ours am: 9b39c5f6b3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: I9e2888956192d094ef9fa7dd19562faad1c58d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 00:09:02 +00:00
Jing Ji
ae6fc5dcbd [automerger skipped] [automerge] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. 2p: 5985225e77 am: 3aefd55cf8 -s ours am: 3e3793070e -s ours am: fee2e78547 -s ours am: 26059e9d29 -s ours am: 0efdbcdbf8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: I46ab7a439cd6aeefe7d4dfaa6af065891b4f27d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 00:09:00 +00:00
Jing Ji
aa38c57378 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38 am: 42c14393e6 -s ours am: 1d6a1c98a2 -s ours am: 11a01ff266 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: Ic2f986315c54fb138132e725098fe57290480457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 00:08:59 +00:00
Automerger Merge Worker
cee5e47a15 Merge changes from topic "am-039e403088cd4f18a656c3a5d89a8981"
* changes:
  [automerger skipped] Merge "Add new owner to the resume-on-reboot module." into android13-tests-dev am: 55ff235419 -s ours
  [automerger skipped] Add new owner to the resume-on-reboot module. am: 483f02cf02 -s ours
2022-11-15 00:08:55 +00:00
Eric Zhang
811d18fcb6 [automerger skipped] Merge "Add new owner to the resume-on-reboot module." into android13-tests-dev am: 55ff235419 -s ours
am skip reason: Merged-In I5af32f68652d5854e6a99b59f2f56fcaac575588 with SHA-1 5c9a11c15f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2301497

Change-Id: Ia2ddad3422447c74f8a36010850cb6ce75f7a2c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 00:08:44 +00:00
Eric Zhang
1690162a03 [automerger skipped] Add new owner to the resume-on-reboot module. am: 483f02cf02 -s ours
am skip reason: Merged-In I5af32f68652d5854e6a99b59f2f56fcaac575588 with SHA-1 5c9a11c15f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2301497

Change-Id: Iaa1b225adef5d13ae824021cf56d427d97cb52c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 00:08:33 +00:00
TreeHugger Robot
bad83b12df Merge "Release QS_SECONDARY_DATA_SUB_INFO flag" 2022-11-15 00:07:27 +00:00
Jing Ji
e9451ef229 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-v2-dev am: a268a99083 -s ours am: f5763f34ed -s ours am: 10f46e1917 -s ours am: e53db3cfc6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322453

Change-Id: I7747e10efbd24de145cffa186a76f0eb86ae951d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 00:06:39 +00:00
Jing Ji
fb9b1b080f [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 74b6e62aed -s ours am: 678758d116 -s ours am: 64abdb45f7 -s ours am: 13740f642d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322453

Change-Id: Id7bf2ee77c99300d7ea0f4172a18ba7dbdd04932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 00:06:32 +00:00
Jim Sun
2bbc86235f Merge "Create module-specific Hal versions" 2022-11-15 00:02:39 +00:00
David Zhao
3d254be3c2 Merge "Add requestStopRecording APIs" 2022-11-15 00:02:18 +00:00
Jing Ji
8442f15b5e [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30b8 am: e6bfe173ca -s ours am: 50e469e8ff -s ours am: c8640975fb -s ours am: 1a7f933b02 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: Iaf34b8798c7cc88b8aa4aaf3497d9aba901c6fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:59:32 +00:00
Jing Ji
b9dae8576b Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0dd am: 673ddf6188 am: b41a54fdc3 am: c762b28c29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: Ib31c2199464e9472f6264d140d75aeec937ffbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:57:11 +00:00
Jing Ji
0efdbcdbf8 [automerger skipped] [automerge] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. 2p: 5985225e77 am: 3aefd55cf8 -s ours am: 3e3793070e -s ours am: fee2e78547 -s ours am: 26059e9d29 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: I97183a07d0dd7868fc8093ac1a3f0e04d46312cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:56:55 +00:00
Jing Ji
e53db3cfc6 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-v2-dev am: a268a99083 -s ours am: f5763f34ed -s ours am: 10f46e1917 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322453

Change-Id: I278c31643c4f1d8c2b0419f839900b3a0005c0ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:54:13 +00:00
Jing Ji
13740f642d [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 74b6e62aed -s ours am: 678758d116 -s ours am: 64abdb45f7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322453

Change-Id: Ibcabccbf6c2297f5f2ab8e2bd3bfd406717106ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:53:56 +00:00
Yein Jo
c35b0eb43f Merge changes from topic "noise-ripple" into tm-qpr-dev am: b363fa61bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20402156

Change-Id: Ifb562a6d17c677adebfffb94c6e2a124d2454e3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:51:21 +00:00
Eric Zhang
55ff235419 Merge "Add new owner to the resume-on-reboot module." into android13-tests-dev 2022-11-14 23:48:06 +00:00
Tim Murray
d7f2ef4b95 Merge changes Id4519038,I21e240ed,I3059cc60
* changes:
  ProcessStateRecord: add oom_adj type tracing
  Revert "Revert "BroadcastQueue: more increasing delay knobs.""
  BroadcastProcessQueue: ensure accuracy of persistent and instrumented flags
2022-11-14 23:41:18 +00:00
Ale Nijamkin
5fe67271b3 [automerger skipped] Merge "Content provider for quick affordances." into tm-qpr-dev am: 99be1de599 am: 6ce13c65d1 -s ours
am skip reason: Merged-In Ia47a8ee322028042bb3e118ddb82a92a27eae191 with SHA-1 c6c5ae9594 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20446910

Change-Id: I809107404c378b996fd59f71d555c9a7373e69aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:38:51 +00:00
Jing Ji
9b39c5f6b3 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e am: b1003d47de -s ours am: 434c657230 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: Ic85b219126c0e4186b11fe0748c790563446b5e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:36:03 +00:00
Jing Ji
11a01ff266 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38 am: 42c14393e6 -s ours am: 1d6a1c98a2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: I5d6f8846e7ff09f53c075af762d3e8081786cb6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:35:57 +00:00
Yein Jo
b363fa61bb Merge changes from topic "noise-ripple" into tm-qpr-dev
* changes:
  Add turbulence noise effects after ripple in UMO.
  Add a turbulence noise shader for media player and ghost loading effects.
2022-11-14 23:28:57 +00:00
Jing Ji
1a7f933b02 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30b8 am: e6bfe173ca -s ours am: 50e469e8ff -s ours am: c8640975fb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: I6c872c9a63439f3315467a961d79898963ddad66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:27:27 +00:00
Jing Ji
c762b28c29 Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0dd am: 673ddf6188 am: b41a54fdc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: Id3cec75f16e749e34ff8c5a83080154d4e42c439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:26:36 +00:00
Jing Ji
26059e9d29 [automerger skipped] [automerge] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. 2p: 5985225e77 am: 3aefd55cf8 -s ours am: 3e3793070e -s ours am: fee2e78547 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: Iba50c7d30b02560428c756c6632fe8245a271893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:26:33 +00:00
Jing Ji
10f46e1917 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-v2-dev am: a268a99083 -s ours am: f5763f34ed -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322453

Change-Id: Ieb0a43cc1ec61d6081f73b1784f7dfb7b5586ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:24:54 +00:00
Jing Ji
64abdb45f7 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 74b6e62aed -s ours am: 678758d116 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322453

Change-Id: If9a5788ac4bdbe0a54605b7b097ae5900419f389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:24:42 +00:00
Ale Nijamkin
6ce13c65d1 Merge "Content provider for quick affordances." into tm-qpr-dev am: 99be1de599
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20446910

Change-Id: Ifdb3873a8e57c954b6b6ed2ec098dd32b0612230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:09:32 +00:00
Jing Ji
c8640975fb [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30b8 am: e6bfe173ca -s ours am: 50e469e8ff -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: I6885682464073cb62aa96a555682db9435343417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:54:50 +00:00
Jing Ji
b41a54fdc3 Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0dd am: 673ddf6188
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: Iab0ef2b26f0c30b5954a96fc67ca1acfbad13e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:54:20 +00:00
Jing Ji
fee2e78547 [automerger skipped] [automerge] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. 2p: 5985225e77 am: 3aefd55cf8 -s ours am: 3e3793070e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: I19843ab9cac8ea88fdd8c78bef518d4d1d430af1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:54:06 +00:00
Jing Ji
434c657230 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e am: b1003d47de -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: I61548f6f9d5c0705fd751ef407ccee3e3ba62aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:53:06 +00:00
Jing Ji
1d6a1c98a2 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38 am: 42c14393e6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: Ie6597e73ce54554cb9aa87db992f701a319c2137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:52:41 +00:00
TreeHugger Robot
40dcc64cb4 Merge "Log WTF message when FGS is started by bindService() from a persistent process." 2022-11-14 22:50:19 +00:00
Jing Ji
50e469e8ff [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30b8 am: e6bfe173ca -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: I72ff403644354ed30bc2b27e7be28e44fb42f5d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:43:30 +00:00
Jing Ji
673ddf6188 Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: I2b17c7ce1d6f4280c56916e3783a56087469b493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:42:13 +00:00
Jing Ji
3e3793070e [automerger skipped] [automerge] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. 2p: 5985225e77 am: 3aefd55cf8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: Iad57fc18222b0b5a5eb6ac2226cac901c7487702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:42:02 +00:00
Jing Ji
e6bfe173ca Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-dev am: 4eca7b30b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635

Change-Id: Ib51225a3c4ebfd8830b0ba4280085364e838bbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:39:35 +00:00
Jing Ji
f5763f34ed [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into sc-v2-dev am: a268a99083 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322453

Change-Id: Id711a137d03663e2774aaf05425c246ad21905a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:37:47 +00:00
Jing Ji
678758d116 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 74b6e62aed -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322453

Change-Id: I99f34d2515ea84a39de5f40760229a72bf35a862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:37:14 +00:00
Ale Nijamkin
99be1de599 Merge "Content provider for quick affordances." into tm-qpr-dev 2022-11-14 22:36:59 +00:00
Jeremy Meyer
558358612b Merge "implement drawable frros" 2022-11-14 22:35:08 +00:00
Jing Ji
b1003d47de Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: I7a836e1526668623fd19b6b23534eae270252df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:25:56 +00:00
Jing Ji
42c14393e6 DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: If2c17dd1a5d80952dd61e3b58cf4eaf18f4ee70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:25:41 +00:00
Automerger Merge Worker
0077f82b7b Merge "Merge "ServiceManager APIs for Remote Key Provisioning mainline module." am: 81c4fd8041 am: 0dda81576c" into tm-qpr-dev-plus-aosp am: 3966b14282
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2299820

Change-Id: Icf1bde247713c6b71f3f235d4598b6693ed416ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:25:29 +00:00
Jorge Gil
bc425d503d Merge "Add WCT#setDragResizing to optimize fluid resizing" into tm-qpr-dev am: 1f17bf7eba am: f28339c869
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20378671

Change-Id: I3cdea614c657c696c551d31672b215cb80eeb789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:24:21 +00:00
TreeHugger Robot
a9a29f94dd Merge "UM.isUserTypeEnabled @TestApi" 2022-11-14 22:23:46 +00:00