Commit Graph

763148 Commits

Author SHA1 Message Date
Bill Yi
fdbcceeaee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4458ca21d1 -s ours am: 41608ecf87 -s ours am: 606279ccb9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79d14f4ba2da9e5a377a5c1a022c69cf2a9fbe57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:14:27 +00:00
Bill Yi
33e4d1c879 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6c6d702352 -s ours am: 3f0f6c9762 -s ours am: 1f70d83eb1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If958c43ded952774412f60fec1cc2165093985bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:13:41 +00:00
Bill Yi
1cb7e02816 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a450acbc3 -s ours am: ec92d27811 -s ours am: b442bbd8af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I50bd45ade9aa64477701f9855fbd9c44fbed33f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:13:33 +00:00
Bill Yi
1aa462b8da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6c6d702352 -s ours am: 3f0f6c9762 -s ours am: ceefa118fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8cb421b7fe3e0b5770894a9f76ec6137c827678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:13:01 +00:00
Bill Yi
090f80e8d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a450acbc3 -s ours am: ec92d27811 -s ours am: 3f0dd38242 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I15145962294e6a24d8b5f031b634d3fe50fe8a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:12:58 +00:00
Automerger Merge Worker
805830f7f6 Merge changes from topic "am-96db44aa4dfa4e4485d74486d8ea6f46" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5a06757d3e -s ours am: 1c70ef845b -s ours am: 28da68acfa -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fab6ce2b1 -s ours am: ed410f2d7f -s ours am: 000ae9c5ca -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e8643d9152 -s ours am: fc66866768 -s ours am: 2777849ee1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b48e51d3c4 -s ours am: cc233c7706 -s ours am: 94f9443382 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 1141306f85 -s ours am: 90f6ca769d -s ours am: 141c898497 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c7f6e95c -s ours am: ee2bee6350 -s ours am: 3b8ae18176 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b179433113 -s ours am: 2e3cdeaba6 -s ours am: d834b8408d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9c3c51727 -s ours am: 5893c50790 -s ours am: 69c385b68e -s ours
2022-05-04 18:01:06 +00:00
Bill Yi
87614a400f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5a06757d3e -s ours am: 1c70ef845b -s ours am: 28da68acfa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d8293fdd077e5d010b2f592458119298cd1c796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:52 +00:00
Bill Yi
73f631ebb4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fab6ce2b1 -s ours am: ed410f2d7f -s ours am: 000ae9c5ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97fed63a2264544f582a068d0a5c9d49ac471bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:50 +00:00
Bill Yi
8a4dfcb3bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e8643d9152 -s ours am: fc66866768 -s ours am: 2777849ee1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb862afaf9594eb128bb189086ad972172ef3957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:49 +00:00
Bill Yi
6ff0f6aa6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b48e51d3c4 -s ours am: cc233c7706 -s ours am: 94f9443382 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic49f3dfa084084dd3b61487546fecc024c38db09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:47 +00:00
Bill Yi
b10ae35d5b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 1141306f85 -s ours am: 90f6ca769d -s ours am: 141c898497 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5cdefa0fee76e64b53f9f507118823f7a70b438a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:43 +00:00
Bill Yi
94f1720ec1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c7f6e95c -s ours am: ee2bee6350 -s ours am: 3b8ae18176 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c02230c74c471673afbf363b9dad7c2233a23c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:33 +00:00
Bill Yi
d4be77cc39 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b179433113 -s ours am: 2e3cdeaba6 -s ours am: d834b8408d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7588f63040ccc6be370de43888926389cfe91536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:16 +00:00
Bill Yi
4b2f3225cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5a06757d3e -s ours am: 1c70ef845b -s ours am: 072971c55e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03de26811f8a01c813d5910f5c5f8c8b5eff3e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:04 +00:00
Bill Yi
37615755ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fab6ce2b1 -s ours am: ed410f2d7f -s ours am: ec8d06bde9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I468aa1f05e208424e1647c56855187e10803f726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:03 +00:00
Bill Yi
9319b05fc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e8643d9152 -s ours am: fc66866768 -s ours am: be28849028 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d9f5387e05f1bbf00b22bae25f1fc04c6c08bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:01 +00:00
Bill Yi
72630e5b71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9c3c51727 -s ours am: 5893c50790 -s ours am: 69c385b68e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85971503048bfb3d848095ca4a9e19a91d57f8b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:00:00 +00:00
Bill Yi
76e42abaed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b48e51d3c4 -s ours am: cc233c7706 -s ours am: 52efe4e114 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I661c6d04e5c43bd257e6a8913be42a9591a44f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:59:59 +00:00
Bill Yi
7d0b805c03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 1141306f85 -s ours am: 90f6ca769d -s ours am: 7cb8348251 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e6e72afbd2aea4ee842445b76b458ceab247dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:59:54 +00:00
Bill Yi
8a28f24038 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c7f6e95c -s ours am: ee2bee6350 -s ours am: 0307b454fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7dc47dedfae7a13704eb5ba8ebfa3a85f3092fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:59:45 +00:00
Bill Yi
6150f784c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b179433113 -s ours am: 2e3cdeaba6 -s ours am: 388165c54f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I665df0ea641e901cea5a3c4f54b7ee024dd7c284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:59:27 +00:00
Bill Yi
3c3450c3c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9c3c51727 -s ours am: 5893c50790 -s ours am: 218d23b582 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib84c9f0c9833da9350ae5f2b0c597391f4291296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:59:12 +00:00
Adam Bookatz
08b227c850 Merge "Ensure getUserName cannot return null" into tm-dev am: 1503b56202 am: 10b45a2107
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18126297

Change-Id: I3d6a7beabadc6253f44b4455f20871dcd845643e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:59:07 +00:00
TreeHugger Robot
1365645633 Merge "[Output Switcher] Delete fallback check under api" into tm-dev am: 84c7839728 am: 7364689c1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157287

Change-Id: I8c57b58b72c2a3e53bb650b3de20de02372e1a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:58:46 +00:00
Automerger Merge Worker
3e0442d640 Merge changes from topic "am-9fa7d80b21934066ba9777d72c99d3a2" into tm-d1-dev-plus-aosp
* changes:
  Merge changes from topic "tc_change_21" into tm-dev am: 7bd6d9e1d0 am: 4abf9e3d4b
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 18edef1d0a am: 70f74f854b -s ours am: cc8cc867d3 -s ours
  Merge changes from topic "tc_change_21" into tm-dev am: 10ee4528da am: b7c76c4a24
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6e46b57fe am: 9c1ed09452 -s ours am: 9622e4b41c -s ours
  Merge changes from topic "tc_change_21" into tm-dev am: ed80739e32 am: 969c07122b
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e639ceb204 am: f3fa12661d -s ours am: 28f98060d3 -s ours
  Merge changes from topic "tc_change_21" into tm-dev am: a81e4a06e9 am: ca688ab765
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c89591c3a am: 9ab47bdd63 -s ours am: 979b222c12 -s ours
2022-05-04 17:58:28 +00:00
Adam Bookatz
eb4d5a9cbd Merge "Ensure getUserName cannot return null" into tm-dev am: 1503b56202 am: 655c91a157
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18126297

Change-Id: I32e8a097b8f65e1bffb95ddca169805e969dbb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:58:22 +00:00
Bill Yi
391186fe99 Merge changes from topic "tc_change_21" into tm-dev am: 7bd6d9e1d0 am: 4abf9e3d4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108551

Change-Id: Ibd3205c2cead88cd93bb64faaa88ca7c38748b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:58:09 +00:00
TreeHugger Robot
928167bd9c Merge "[Output Switcher] Delete fallback check under api" into tm-dev am: 84c7839728 am: f123f5df93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157287

Change-Id: I0f920b7fd1e4b2e86601e2360daac001a72f3d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:58:07 +00:00
Bill Yi
bbef495480 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 18edef1d0a am: 70f74f854b -s ours am: cc8cc867d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0aa1c91740ce56ce0e11fb2740eb91d6336a72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:58:07 +00:00
Bill Yi
37ce4e15e8 Merge changes from topic "tc_change_21" into tm-dev am: 10ee4528da am: b7c76c4a24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18100772

Change-Id: I65c2ebffb66bad4f9e218c64f42a5b1cf127be55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:58:06 +00:00
Bill Yi
c8105102d3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6e46b57fe am: 9c1ed09452 -s ours am: 9622e4b41c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I16f13320ed5b0cb7e6285a147c2d50ad5caf6d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:58:04 +00:00
Bill Yi
e26b151d32 Merge changes from topic "tc_change_21" into tm-dev am: ed80739e32 am: 969c07122b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18103870

Change-Id: I8b9d393d3fd688c73e6d3c02ee0d33628d9a9ca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:58:02 +00:00
Bill Yi
7d23f4bb9b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e639ceb204 am: f3fa12661d -s ours am: 28f98060d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f3f2dfebbf3ab5e303fcfcf60c7c141e2c10ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:58 +00:00
Bill Yi
0eeb336abf Merge changes from topic "tc_change_21" into tm-dev am: a81e4a06e9 am: ca688ab765
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18100509

Change-Id: I148f6e4fc25144922eb89f03703d185aee8e661c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:50 +00:00
Bill Yi
8a39ed87a8 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c89591c3a am: 9ab47bdd63 -s ours am: 979b222c12 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If7996fcd5df5e77e3ece3c112805e5e923257d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:42 +00:00
Bill Yi
9e4007471d Merge changes from topic "tc_change_21" into tm-dev am: 7bd6d9e1d0 am: b9764598dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108551

Change-Id: I4101354aaea48b9622b02d5e94f63193aa7f273b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:27 +00:00
Bill Yi
cb40a28e3f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 18edef1d0a am: 70f74f854b -s ours am: 018a673b01 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9faf5899ac6fb14c7640e582319e55c6700d7fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:25 +00:00
Bill Yi
5878503902 Merge changes from topic "tc_change_21" into tm-dev am: 10ee4528da am: ab7bdcf1ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18100772

Change-Id: Ifd5f12a2ffdde61016ff7a9ff937962eb3bbde72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:23 +00:00
Bill Yi
949528742a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6e46b57fe am: 9c1ed09452 -s ours am: 692470d1f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2533fcc910345d5e6e68ea74076d409041016d4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:22 +00:00
Bill Yi
1cbb5ffc87 Merge changes from topic "tc_change_21" into tm-dev am: ed80739e32 am: a793b10dc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18103870

Change-Id: Id197ba0fed3a26d1a2e71d308889fd90693d4847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:20 +00:00
Bill Yi
db43fa4b44 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e639ceb204 am: f3fa12661d -s ours am: 783bc0aba5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib36345690f1bcda9e771289e29d12e9fc9a2a7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:16 +00:00
Bill Yi
42836338bf Merge changes from topic "tc_change_21" into tm-dev am: a81e4a06e9 am: 4599fe09de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18100509

Change-Id: I26747773c83e368dce856205c44e54d71127b641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:08 +00:00
Bill Yi
7a6a09bc7e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c89591c3a am: 9ab47bdd63 -s ours am: 5bbd75305b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I767d7949ac7b6f4e1202dd852e6cc082820f21d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:57:00 +00:00
Yuri Lin
2bb9c464ea Merge "Show "review notification permissions" notification" into tm-dev am: a436e42912 am: 2efc4a2d02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716555

Change-Id: I44e7ba2757029280cc93880d0c3cde14c76162da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:55:56 +00:00
Yuri Lin
a3584ae44e Merge "Show "review notification permissions" notification" into tm-dev am: a436e42912 am: 4b4d67174e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716555

Change-Id: I3cd636859dbf082f9d60be4815fe5b4c8ed033fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:55:47 +00:00
Bill Yi
ceefa118fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6c6d702352 -s ours am: 3f0f6c9762 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I922ab9db70c956574419a68a3c4351db8edd34f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:55:14 +00:00
Bill Yi
3f0dd38242 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a450acbc3 -s ours am: ec92d27811 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7f06caa59af787858a4571ab105379e83bac7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:55:10 +00:00
Bill Yi
072971c55e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5a06757d3e -s ours am: 1c70ef845b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ea6e0ed807d3d37a8b0fe80410d6a8fba564928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:54:30 +00:00
Bill Yi
ec8d06bde9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fab6ce2b1 -s ours am: ed410f2d7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If07e7e19adb1aea530db1acfcfdd98e87dd2704c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:54:26 +00:00
Bill Yi
be28849028 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e8643d9152 -s ours am: fc66866768 -s ours
am skip reason: subject contains skip directive

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

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