Commit Graph

756613 Commits

Author SHA1 Message Date
Jonathan Scott
e75b9ba032 [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am: b7fd49e0d4 -s ours am: ef63274440 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebef1a356e84064c45daf9bf2778f555a295c6b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:52:21 +00:00
Pablo Gamito
fe08102149 Merge "Demote flaky flicker tests" into tm-dev am: 12b486a3c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17606694

Change-Id: Ib0307eade1576c7d02df9542db8bc16acbce6cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:52:09 +00:00
Treehugger Robot
04e616889e Merge "Change aapt2 to specify full protos" am: 6787226865 am: 3da3dce716 am: ccd8e91bf1 am: 2f58e1c38c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037107

Change-Id: I5ae7c47352439751798ec43a1d4d62e339bef5b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:51:25 +00:00
TreeHugger Robot
df30f815d9 [automerger skipped] Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f am: 8531b25d63 -s ours am: 36f23cd8ac -s ours am: b7847a9aaa -s ours am: d3f2f43fdb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84f74600f37d5f9b20233574a7a0b6103f623117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:51:06 +00:00
Automerger Merge Worker
1b6171fde4 Merge changes from topic "am-c418ed2ce8084abd8ce2fcc75e7baf7e" into tm-dev am: f93b8f0e0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: I363fdbdc54a928184244f6bf596ab1231ea11bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:50:55 +00:00
Jonathan Scott
092a8734e5 [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: 685d6d3841 -s ours am: e59b3947e9 -s ours am: da3ed035aa -s ours am: ab5d7854da -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieaa8e3decb083377364974ba44bd4061724a820b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:50:54 +00:00
Ruslan Tkhakokhov
b862834b88 [automerger skipped] Merge "Skip restore of read-only directories" into tm-dev am: 59317a8d00 -s ours
am skip reason: Merged-In I644a5784fb42352ba28ac944d3aa3564b0215a78 with SHA-1 98f8122702 is already in history

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

Change-Id: Id06a5a57a83568603c79ff55246b7376afeb1765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:50:10 +00:00
Ruslan Tkhakokhov
e1d0d7d2a0 [automerger skipped] Skip restore of read-only directories am: 5dd86bcb8a -s ours
am skip reason: Merged-In I644a5784fb42352ba28ac944d3aa3564b0215a78 with SHA-1 98f8122702 is already in history

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

Change-Id: Ibab592ad176fef3a8248382e417eb5683f5e2259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:50:08 +00:00
TreeHugger Robot
dd36f7fa8e Merge "Add a flicker test to verify IME snapshot when dismissing dialog" into tm-dev am: cd9af56183
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17411126

Change-Id: Iaad4fdb09376a5ec91c694c84a5a7876f0715d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:49:05 +00:00
Evan Laird
975868b40f Merge "Add carrier config support to operator name in statusbar" into tm-dev am: 32e1fa353b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17201785

Change-Id: Ic66bd599fbdd249fe277ac5209bddd2b087f97a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:48:44 +00:00
Jonathan Scott
ef63274440 [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am: b7fd49e0d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic89c7512dd8767088faa192a4a347d6b4cfcafdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:48:42 +00:00
Pablo Gamito
12b486a3c9 Merge "Demote flaky flicker tests" into tm-dev 2022-04-06 21:50:56 +00:00
Treehugger Robot
2f58e1c38c Merge "Change aapt2 to specify full protos" am: 6787226865 am: 3da3dce716 am: ccd8e91bf1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037107

Change-Id: I23fd8af293fc5acd7748294d6cb61289565b8c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:32:06 +00:00
Treehugger Robot
ccd8e91bf1 Merge "Change aapt2 to specify full protos" am: 6787226865 am: 3da3dce716
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037107

Change-Id: I8c4024295ea6d5b5c1578459fd98c3e892338219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:26:49 +00:00
TreeHugger Robot
d3f2f43fdb [automerger skipped] Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f am: 8531b25d63 -s ours am: 36f23cd8ac -s ours am: b7847a9aaa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaba0f48a0c9bceeb02bbfee2cb837caf2efc3558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:25:56 +00:00
Automerger Merge Worker
f93b8f0e0d Merge changes from topic "am-c418ed2ce8084abd8ce2fcc75e7baf7e" into tm-dev
* changes:
  Merge changes from topic "sv2sec-sc-dev" into sc-qpr1-dev am: 9c59526a34 am: 22be71ece0 am: d8b405adbd
  [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: 685d6d3841 -s ours am: e59b3947e9 -s ours am: da3ed035aa -s ours
2022-04-06 21:25:48 +00:00
TreeHugger Robot
885faedcbc Merge changes from topic "sv2sec-sc-dev" into sc-qpr1-dev am: 9c59526a34 am: 22be71ece0 am: d8b405adbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: Ida7c017fc359bdeccd6518f80e1478f5190fbdb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:25:03 +00:00
Jonathan Scott
ab5d7854da [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: 685d6d3841 -s ours am: e59b3947e9 -s ours am: da3ed035aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I76c731f6cae57c1d4321433f84fb0028ebb2a25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:24:41 +00:00
Ruslan Tkhakokhov
59317a8d00 Merge "Skip restore of read-only directories" into tm-dev 2022-04-06 21:24:36 +00:00
TreeHugger Robot
cd9af56183 Merge "Add a flicker test to verify IME snapshot when dismissing dialog" into tm-dev 2022-04-06 21:23:34 +00:00
Evan Laird
32e1fa353b Merge "Add carrier config support to operator name in statusbar" into tm-dev 2022-04-06 21:22:29 +00:00
Jonathan Scott
b7fd49e0d4 [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If473034f431643418b642988a9d19c5dc8d6ed79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:17:41 +00:00
TreeHugger Robot
b7847a9aaa [automerger skipped] Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f am: 8531b25d63 -s ours am: 36f23cd8ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I669dca9829b85a5f4dae92945fc1baef3869e201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:09:06 +00:00
TreeHugger Robot
d8b405adbd Merge changes from topic "sv2sec-sc-dev" into sc-qpr1-dev am: 9c59526a34 am: 22be71ece0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: Ied52d544ae1dfcd6e1dd2d5d56311519f39d990d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:08:36 +00:00
Jonathan Scott
da3ed035aa [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: 685d6d3841 -s ours am: e59b3947e9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1b64a784b22ddeffaac0c3afff49f35d40ca84ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:08:16 +00:00
Treehugger Robot
3da3dce716 Merge "Change aapt2 to specify full protos" am: 6787226865
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037107

Change-Id: I6d4221ca092ff126676c3f93925c83268a339506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:07:04 +00:00
Mateusz Cicheński
c27d9a7ec3 Merge "Move PiP when it occludes a keep clear area with naive algorithm." into tm-dev am: 9e7f234b10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17542127

Change-Id: I8994b7a6b80b8fc95a75399d57103b853ca6c4d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:02:18 +00:00
TreeHugger Robot
18c227bd3c [automerger skipped] Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f am: 4199b38fe2 -s ours am: 32489e2a05 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6f5871c973e2d22c9655f39d04a83e7218c4a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:02:03 +00:00
TreeHugger Robot
233c70618b Merge changes from topic "sv2sec-sc-dev" into sc-mainline-prod am: 4bfbca30eb am: 7d79abc5b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: I614765196f4c49c2414a8b898cbe8975cf4c8120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:01:50 +00:00
Jonathan Scott
8520e97872 [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: f7af0e5edf -s ours am: b836749db1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d0a9a8f4b4913f10f3e2fc61e5ac5165c1245d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:01:48 +00:00
TreeHugger Robot
9ee28fd23c [automerger skipped] Merge "[scv2] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-v2-dev am: 5c16efff74 am: d28f546852 -s ours am: d66abb9684 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia294562337ce3940ccb715eb096c84e3b389876e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:01:36 +00:00
TreeHugger Robot
203ba2293f Merge changes from topic "sv2sec" into sc-v2-dev-plus-aosp am: 22c713eeae am: 29e2d39cd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567140

Change-Id: Ic036ebadefef5eb21e9c4ecefb63cf456a67b9b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:01:09 +00:00
Jonathan Scott
527fb2b31f [automerger skipped] [automerge] [scv2] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b157e658a7 am: 58bbfc4167 -s ours am: 688b62c5e6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6dd10f81886fe6213a51e8212e245486f6c22685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:01:07 +00:00
Jonathan Scott
b7248d037f [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79744a8cbee16ade46d2f7eb0849b3c6fd41de6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:59:49 +00:00
TreeHugger Robot
36f23cd8ac [automerger skipped] Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f am: 8531b25d63 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaf2207c0ec70e7869797e981197a3b6997faa5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:46:31 +00:00
TreeHugger Robot
22be71ece0 Merge changes from topic "sv2sec-sc-dev" into sc-qpr1-dev am: 9c59526a34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: I86bbad2a5114284d45e566bda350d004b79dbf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:45:53 +00:00
Jonathan Scott
e59b3947e9 [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: 685d6d3841 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65e67129e9a02039800aa4d3cb6bce1ebd5a9e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:45:43 +00:00
Mateusz Cicheński
9e7f234b10 Merge "Move PiP when it occludes a keep clear area with naive algorithm." into tm-dev 2022-04-06 20:41:53 +00:00
TreeHugger Robot
8531b25d63 Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: I8e21c49a0b1d9a9f1d29d46c8f5a6731b1f6731c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:37:26 +00:00
TreeHugger Robot
32489e2a05 [automerger skipped] Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f am: 4199b38fe2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8893aafc5a8b9de3b2142259d2586a99290923ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:37:11 +00:00
TreeHugger Robot
7d79abc5b0 Merge changes from topic "sv2sec-sc-dev" into sc-mainline-prod am: 4bfbca30eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: Ifc6ca03c71f1a792b473d09d7c51a9e18db4b738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:36:40 +00:00
Jonathan Scott
b836749db1 [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: f7af0e5edf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98df6779cbe14b6eea6f3cf9c8313d3612fe2e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:36:20 +00:00
TreeHugger Robot
d66abb9684 [automerger skipped] Merge "[scv2] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-v2-dev am: 5c16efff74 am: d28f546852 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id54a9cdc5f4bc28952cb54e40b0f8f4ca5b07866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:35:45 +00:00
TreeHugger Robot
4199b38fe2 Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: I487cd8a2444ff0d06f6f4fd497913185fca5f97b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:35:39 +00:00
TreeHugger Robot
29e2d39cd9 Merge changes from topic "sv2sec" into sc-v2-dev-plus-aosp am: 22c713eeae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567140

Change-Id: Iec12f4550ba598d87dc4b295ddab85ec0af33f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:35:18 +00:00
Jonathan Scott
688b62c5e6 [automerger skipped] [automerge] [scv2] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b157e658a7 am: 58bbfc4167 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1a6a11adc3a2f62f2f5010f5cc90b66c2fd5d76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:35:02 +00:00
Jonathan Scott
62de92b4ea [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530

Change-Id: If074f02ab9e82a4b3d97725f70f3799037e581a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:34:54 +00:00
TreeHugger Robot
d28f546852 Merge "[scv2] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-v2-dev am: 5c16efff74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567140

Change-Id: I7c29d28b4b6cfa55841d2ad6df0da52f508eff31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 20:34:46 +00:00
TreeHugger Robot
5c16efff74 Merge "[scv2] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-v2-dev 2022-04-06 20:18:12 +00:00
TreeHugger Robot
22c713eeae Merge changes from topic "sv2sec" into sc-v2-dev-plus-aosp
* changes:
  [automerge] [scv2] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b157e658a7
  [scv2] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning.
2022-04-06 20:18:12 +00:00