Commit Graph

784131 Commits

Author SHA1 Message Date
Alex Buynytskyy
2ed60a301e Merge "More robust restorecon and additional debug info." into tm-dev am: 8169e839ca am: a18cf5d20f am: aa28895197 am: 6fff5a29ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18129666

Change-Id: Iac37ffa92fa1bbb517bfb0613526176e689a7246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:47:32 +00:00
Lucas Dupin
819e4bd69e Merge "Revert "Do not ignore forceReload requests"" into tm-dev am: b681d512ab am: 8f106b97ae am: b43f54f27a am: 62e45ec9bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130402

Change-Id: Ie54175f7d0c6616c30d8d7f8ce2f90154e094b19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:46:57 +00:00
Hawkwood Glazier
ad5bf51624 Merge "Fix corner clipping on UMO" into tm-dev am: c1170e1cd8 am: a7423d6294 am: 1e944284b9 am: e2ef067a2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944767

Change-Id: Iefb9ee51e93e1fafb53cf31450e1cd7440bba8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:46:06 +00:00
Hui Yu
b3ec9140ef Merge "canStartForegroundServiceLocked() checks both UID and binding client UID." into tm-dev am: d7f6a11db4 am: eb12b1ce32 am: 6551471d19 am: b5ea650674
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011485

Change-Id: I765bfaf4d5f891f4134827e1ab69b7674a3ccc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:45:15 +00:00
Dmitri Plotnikov
c80d367a05 Merge "Address proportional counting for out-of-order timestamps" into tm-dev am: 860fe90fbd am: 892520724e am: 63f6625add am: 1292aeb55e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18062923

Change-Id: I3a14b466333a57da4bac4281efada7075bfef566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:44:14 +00:00
Ilya Matyukhin
e2dbaedf72 Merge "Add onUiReady to AlternativeTouchProvider" into tm-dev am: 6bcd7fdc9a am: 1564ee9dcc am: e885bfa511 am: 755b1864b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18129622

Change-Id: I4aa7036b5b178295fc0dcc0e55489b0cffd52882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:41:59 +00:00
Hawkwood Glazier
553c6cd633 Merge "Fix Squashing Issue on UMO Background" into tm-dev am: 7d130a7e1f am: 0ea784a667 am: fe4ded55ad am: c4d34e48e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18122353

Change-Id: Ia9adfcd4b81f438a389a0755021f527f89a8f643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:40:52 +00:00
TreeHugger Robot
c2a83375ad Merge "Add hidden constants to allow the role holder updater to specify the failure strategy" into tm-dev am: a3ca84f805 am: f5f646bf3f am: 43200e0df9 am: 32decca641
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18093642

Change-Id: I8c429a759b39bce99b1331bfc2a790e3c83930c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:40:11 +00:00
Automerger Merge Worker
ffd8189d7b Merge changes from topic "am-29d862ff3c154eb08831104e620095b8"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcf2d1da52 -s ours am: 2ffa916b4e -s ours am: 8c855c6e46 -s ours am: 4f0ca15a68 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfb5f8405 -s ours am: e4ceca1e31 -s ours am: 686fda7c64 -s ours am: 7ffc5f214d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 66688f0d8c -s ours am: 9fc2570531 -s ours am: 4165978c70 -s ours am: 8958207d00 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a2b084482 -s ours am: 689cc72e26 -s ours am: b48e87a72e -s ours am: ab39238950 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6666ab2b4e -s ours am: 046354c916 -s ours am: 24d3a328d4 -s ours am: 189a7e44e6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b877f7d946 -s ours am: 510c5dcf82 -s ours am: 2aaa6a4b62 -s ours am: 2df8731e79 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8625d03046 -s ours am: 5528905c70 -s ours am: 881b8abdcf -s ours am: a4f08063df -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00fe9973d7 -s ours am: 7dcfe1aa66 -s ours am: 258497440a -s ours am: 08218f894c -s ours
2022-05-04 13:39:45 +00:00
TreeHugger Robot
1ebd4aa44e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcf2d1da52 -s ours am: 2ffa916b4e -s ours am: 8c855c6e46 -s ours am: 4f0ca15a68 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e580f3b574020e95c9221804fb193cef0a41e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:39:06 +00:00
Bill Yi
1b664a5708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfb5f8405 -s ours am: e4ceca1e31 -s ours am: 686fda7c64 -s ours am: 7ffc5f214d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b51c9593e06c5a17948804084ec92b9c07010c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:38:48 +00:00
TreeHugger Robot
9fdb3354f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 66688f0d8c -s ours am: 9fc2570531 -s ours am: 4165978c70 -s ours am: 8958207d00 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I979cdf34f31cb351ea9f67c89d9b65f7ecac3a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:38:11 +00:00
Bill Yi
5f90cdcb50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a2b084482 -s ours am: 689cc72e26 -s ours am: b48e87a72e -s ours am: ab39238950 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I066792aa8966302791505ed9923741791683ef6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:37:43 +00:00
TreeHugger Robot
0876d15bc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6666ab2b4e -s ours am: 046354c916 -s ours am: 24d3a328d4 -s ours am: 189a7e44e6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fa23b7d45e0211f8e2f2412e92e3a74b70a68bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:37:28 +00:00
Bill Yi
4be55cec7e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b877f7d946 -s ours am: 510c5dcf82 -s ours am: 2aaa6a4b62 -s ours am: 2df8731e79 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If788c5b1b2bc7993321fa72e0f61a65c007c866a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:37:13 +00:00
TreeHugger Robot
e00383e262 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8625d03046 -s ours am: 5528905c70 -s ours am: 881b8abdcf -s ours am: a4f08063df -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib2cb56e32ff8dd4e4559c803211f59b1dc4e8768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:36:58 +00:00
Matt Pietal
3bc646d329 Merge "Bouncer - Update selected item text color" 2022-05-04 13:36:38 +00:00
Bill Yi
9298b8d289 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00fe9973d7 -s ours am: 7dcfe1aa66 -s ours am: 258497440a -s ours am: 08218f894c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I425025232982664d2a66ccec56d5b4d93ca0cb04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:36:07 +00:00
TreeHugger Robot
1d5b5d23b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a1be19e3e5 -s ours am: d19ad48b3f -s ours am: 2f014d2dc6 -s ours am: ea40b11da7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieca17b86efdffd6f61276b6c05885689c60e5048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:31:31 +00:00
Bill Yi
2fccf46d5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96faf872fe -s ours am: ac2b68ab9b -s ours am: bf53ab07c0 -s ours am: c75e7c6f89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9cf687e46a32d1b48fb7de6810b2ff398777b706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:31:17 +00:00
TreeHugger Robot
833835f86a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b8370b3ff4 -s ours am: a752dda555 -s ours am: 5c0fea076c -s ours am: b7569983a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8bf728b34c5f1219e0c6da89591cec60fc9f3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:31:03 +00:00
Bill Yi
dccc3e7090 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7b1f30c48 -s ours am: 235faa6cf5 -s ours am: f7c9f7ed59 -s ours am: f6e8717364 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18ab407c60eee346bd341bad50c67d319f1726b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:30:43 +00:00
TreeHugger Robot
8fea80fc77 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 4ec0434ad4 -s ours am: 9ef390ab2d -s ours am: e3cf26989b -s ours am: a17329cb7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5b5677be9ec352883571514f8ac1a00f06139b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:30:17 +00:00
Bill Yi
a5b6e00eab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 228ecd8c0d -s ours am: b73fcc9a89 -s ours am: fa0d29c246 -s ours am: 563ab303d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a4ddd197d96c0c2138d963725c6e5e1da72f56c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:29:39 +00:00
TreeHugger Robot
2c9baa5f4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 62a0f916e3 -s ours am: 95d7e085ee -s ours am: ae729d21cc -s ours am: 1afe437f49 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I829421953450db28fa8d358fabfebdf70bd8b93c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:22:01 +00:00
Bill Yi
fb706a7dc9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bd868b63f5 -s ours am: aa3f4ac580 -s ours am: 61d0a76314 -s ours am: 0d8ca843e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7fbeb186571aabe7fb1df29005a3807d395c5245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:21:27 +00:00
TreeHugger Robot
9d621773be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3e09baac84 -s ours am: 15875e4398 -s ours am: 1668b2f24b -s ours am: 0c4832b4af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1e18c7f238f7ccf83e053f27fb5df1ba3eead4d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:21:11 +00:00
Bill Yi
2b91904081 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c998277e44 -s ours am: 9f51c9420c -s ours am: 1847246f87 -s ours am: 17bda15039 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e60a06ccdb9a34af318b572c7c4cc158ce0079f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:20:44 +00:00
Zac Iqbal
8cb23ea07e Merge "Revert "Merge "Restore V2+ signature requirement for system apps" into tm-dev am: a347b6c2e6 am: 8aa6d20125"" into tm-d1-dev am: 570156dd3c am: dd3d3bce51 am: 7c903ec354
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18141981

Change-Id: I17d98297674b5b06f5cedf080336738e348c828b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:19:34 +00:00
Justin Koh
cf183af65f Merge "Creates Dream Tile." into tm-qpr-dev am: 31e221dfb4 am: 814c2d076f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17874521

Change-Id: I53269a8f8f56bc29995bd8e15de9b51d7d16f5fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:18:57 +00:00
Evan Rosky
3a7b0f8370 Merge "Pass NO_USER_ACTION activity option along to shell transition" into tm-qpr-dev am: 5f49a6b8cf am: cfaacb2f23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18133648

Change-Id: Iecfac977409d41d481efb979f498d7cd5bab99e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:17:57 +00:00
TreeHugger Robot
a79bfd6f93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9470d371d4 -s ours am: 976b169c2f -s ours am: 9c40e00b22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a33d7f19b37965dd2f280fc57f11d753624e091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:15:28 +00:00
Bill Yi
26d5815cf9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cd4e6852 -s ours am: 9bf34e9b11 -s ours am: 104251ed09 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I257de268f6057ba180c32bac85ec16c9b7927d45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:15:15 +00:00
TreeHugger Robot
098e5f49a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c48936763b -s ours am: f85ede2581 -s ours am: 80a84642c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0eee11cb1afcc941da5e6f0e93e71471b3b17987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:14:58 +00:00
Bill Yi
495c02dacc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 053fa140b0 -s ours am: f95ffdb6aa -s ours am: 8f4701d8a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I86086b5ce4b7e88ff21c091e94da8cf32bc3dd56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:14:44 +00:00
TreeHugger Robot
5e0e433a41 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b8b0618cb5 -s ours am: 1339f5d232 -s ours am: 99838558cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic9e396410d59da4642e7d784c72e9d35ba4b6974
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:14:12 +00:00
Bill Yi
95d057437a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9272dacc64 -s ours am: d3755ad9e9 -s ours am: e9ace4c576 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d313c2433a3bfe855784b3dabb6f25525c4c5fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:13:59 +00:00
TreeHugger Robot
e53faf1cde [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5e88c0b9ab -s ours am: 057d0f5da1 -s ours am: 56e1915531 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1428293a6054de91592b9a2570f8cb767600e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:13:44 +00:00
Bill Yi
59598322a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5148b23e7b -s ours am: 39173643fa -s ours am: 8da55d2834 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I809d552de364252ef0c8b994b5a93d4f74556796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:13:29 +00:00
TreeHugger Robot
1ac32c4a5f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 929ea847fa -s ours am: 6fbbde0cba -s ours am: 592670dc19 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I96478d8365625b5c051dcd8013c194feff56cd1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:13:02 +00:00
Bill Yi
3b1b18d6c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 394ea0dbb8 -s ours am: 967b3f3813 -s ours am: ebf0263447 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c145e5fa9ce86b5eeda5efb64839c887b9ed3ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:12:34 +00:00
TreeHugger Robot
f3996a9799 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5f7525a198 -s ours am: 89b8a56a16 -s ours am: 28729ab575 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0bfa9514612604cf4761a1c4cf19b333f46491c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:12:13 +00:00
Bill Yi
c56d0b82d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 21708cbe5e -s ours am: 892678d6ed -s ours am: ef9dbeb74e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1abb45602a6c030badc0ad9afad985945040f60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:11:59 +00:00
TreeHugger Robot
58e5e252ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3d2f251c76 -s ours am: 80e85d2f4a -s ours am: 6cd8385af6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice5ff7f81eb2e36c53f784eac0dc950e19307b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:11:45 +00:00
Bill Yi
2f418d57c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f847a133c -s ours am: 0f1e87d085 -s ours am: eeb6bd4a42 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb89b1a02aa7cab9c5ff411bc5536a13966e28c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:11:22 +00:00
TreeHugger Robot
6541b9f4b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4d465c409d -s ours am: cb12f1d644 -s ours am: ad54dab0a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8a6821f4a7af69d99c0a78677d9d36cfd9072d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:10:58 +00:00
Bill Yi
b97efb1339 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a01b23cb -s ours am: 13b0938fa0 -s ours am: 1ae432011b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39b3b63d919e166416b29913fe93557c8a763017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:10:33 +00:00
TreeHugger Robot
b716d5a457 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d2b419eb8c -s ours am: 8dcfbc1fa6 -s ours am: e87f3cb2cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I378782cb0a620473b106accf721e923c43ce903f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:10:19 +00:00
Bill Yi
28489829a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 280953de4c -s ours am: 785cbcf966 -s ours am: f23edda0d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I44acb2d684e04352cc6e589f589b49fa4b091b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:09:51 +00:00
TreeHugger Robot
38f3d1f1c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e1400a551d -s ours am: ab2c186e9b -s ours am: 23f3803d17 -s ours
am skip reason: subject contains skip directive

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

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