Commit Graph

761165 Commits

Author SHA1 Message Date
Bill Yi
529e409ac6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f6a60645fd -s ours am: 4f52a00860 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7dd4b8bfd0a08ce883a9155a43dc9313e88873b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:48:16 +00:00
Bill Yi
606279ccb9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4458ca21d1 -s ours am: 41608ecf87 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I52daa3de04a33b9f573dacf1162da8fab37d5aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:48:11 +00:00
Bill Yi
1f70d83eb1 [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: Ie39a36f40e71930d17335c672ad480afc5e7fdd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:47:56 +00:00
Bill Yi
b442bbd8af [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: Ifa5d1495e736a4ae07de1cb8c516218539142024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:47:53 +00:00
Bill Yi
28da68acfa [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: Iefbaff8e005d589e8b330a70b8caac43051affe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:47:26 +00:00
Bill Yi
000ae9c5ca [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: I8f4db8f179b4badfdc41c2a3b88d70dc6fe536ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:47:25 +00:00
Bill Yi
2777849ee1 [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: Ia354d27f4ebe6d30e9557b4f65c00511a8dc9c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:47:23 +00:00
Bill Yi
94f9443382 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b48e51d3c4 -s ours am: cc233c7706 -s ours
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I9fd2b3774d0a6b49277eb8bffc2b634212eb7942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:38:19 +00:00
Adam Bookatz
1503b56202 Merge "Ensure getUserName cannot return null" into tm-dev 2022-05-04 17:20:45 +00:00
TreeHugger Robot
84c7839728 Merge "[Output Switcher] Delete fallback check under api" into tm-dev 2022-05-04 17:14:18 +00:00
Bill Yi
f6a60645fd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:07:37 +00:00
Bill Yi
4458ca21d1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:07:37 +00:00
Bill Yi
6c6d702352 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:07:37 +00:00
Bill Yi
7bd6d9e1d0 Merge changes from topic "tc_change_21" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 18edef1d0a
  Import translations. DO NOT MERGE ANYWHERE
2022-05-04 17:07:37 +00:00
Bill Yi
10ee4528da Merge changes from topic "tc_change_21" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6e46b57fe
  Import translations. DO NOT MERGE ANYWHERE
2022-05-04 17:07:37 +00:00
Bill Yi
ed80739e32 Merge changes from topic "tc_change_21" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e639ceb204
  Import translations. DO NOT MERGE ANYWHERE
2022-05-04 17:07:37 +00:00
Bill Yi
a81e4a06e9 Merge changes from topic "tc_change_21" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c89591c3a
  Import translations. DO NOT MERGE ANYWHERE
2022-05-04 17:07:37 +00:00
Bill Yi
5a06757d3e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:04:01 +00:00
Bill Yi
e8643d9152 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:04:01 +00:00
Bill Yi
1141306f85 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:04:01 +00:00
Bill Yi
b179433113 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:04:01 +00:00
Yuri Lin
a436e42912 Merge "Show "review notification permissions" notification" into tm-dev 2022-05-04 16:55:29 +00:00
Aaron Liu
f6b4f625c1 Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e7709
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030043

Change-Id: Ifa6f75ca9f3518b252eb5e717ba1bab4515855fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:34:37 +00:00