Bill Yi
|
129bbf0b68
|
Merge changes from topic "presubmit-am-4190bf4705e34070ab3468a176f113b5" into sc-dev-plus-aosp am: ba3e933c7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15591143
Change-Id: Ia16fd90caa5beeb577b7668496138bdb046df522
|
2021-08-17 22:31:49 +00:00 |
|
Bill Yi
|
61dd0e7c94
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c8e007b5de am: 29650fe627 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15591143
Change-Id: Id4272e9511935d1f14f13a5e36be9f16b250ac2c
|
2021-08-17 22:31:48 +00:00 |
|
TreeHugger Robot
|
49d8099a92
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 68e3878944 -s ours am: 9b2132ad58 -s ours am: 6da2929d8b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590111
Change-Id: Ib2ab62487eaad55d342411d99d4ef3e41f323bee
|
2021-08-17 22:28:57 +00:00 |
|
TreeHugger Robot
|
29c2494468
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e323bfb2bc -s ours am: e03f419b66 -s ours am: d3e6a1533f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590971
Change-Id: I01c94fdbac6c8442cc6df8e9cc816aba19ae2b22
|
2021-08-17 22:24:48 +00:00 |
|
TreeHugger Robot
|
89fec9b094
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e3cbdad558 -s ours am: b009bbc13f -s ours am: 8c877419ed -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15598025
Change-Id: I4208a84f959bea4a0ed611e9313c2709558abda7
|
2021-08-17 22:22:58 +00:00 |
|
TreeHugger Robot
|
2e0ce2cc4d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ca24fda21b -s ours am: 43ec6c8ea6 -s ours am: 393b4e3632 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590119
Change-Id: Idcd54bc7fda93ca26b9c7d669acd6e67fd21135b
|
2021-08-17 22:21:49 +00:00 |
|
TreeHugger Robot
|
f9e3b25918
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 13fdf59374 -s ours am: e901fdc011 -s ours am: 91c6fd686c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590977
Change-Id: Ia0161ff27cb9711ab83cd03e50bc2f5af7ec6e41
|
2021-08-17 22:20:13 +00:00 |
|
Bill Yi
|
f27b6cd333
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b82a396d9 -s ours am: e8dda79ee8 -s ours am: 9873a008ce -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15592559
Change-Id: I7053902da456e79803a7686fd5fc685b27d16fe2
|
2021-08-17 22:15:22 +00:00 |
|
Bill Yi
|
ba3e933c7c
|
Merge changes from topic "presubmit-am-4190bf4705e34070ab3468a176f113b5" into sc-dev-plus-aosp
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c8e007b5de
Import translations. DO NOT MERGE ANYWHERE
|
2021-08-17 22:04:39 +00:00 |
|
TreeHugger Robot
|
1731f245b4
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 68e3878944 -s ours am: 9b2132ad58 -s ours am: e4ee99b6ce -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590111
Change-Id: Icf89272eaede9c7666a3c023a1ec2707c3040410
|
2021-08-17 21:05:24 +00:00 |
|
TreeHugger Robot
|
b43d2ec863
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e323bfb2bc -s ours am: e03f419b66 -s ours am: 71e02e9318 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590971
Change-Id: I3781f015c9a74ff74e50eb27d4d18f7e4e98cf89
|
2021-08-17 21:05:14 +00:00 |
|
Lucas Dupin
|
3fc58c5c78
|
Merge "Revert "Revert "Migrate boot animation from GLES 1.0 to GLES2.0.""" into sc-qpr1-dev am: 185741e47d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15585669
Change-Id: Iadf102c6741ded5fc054368b2c018bb51a9ae0ca
|
2021-08-17 21:04:39 +00:00 |
|
TreeHugger Robot
|
2963db6599
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e3cbdad558 -s ours am: b009bbc13f -s ours am: 92b073f947 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15598025
Change-Id: I362168cd6715cc39c9c0f4ceaee58b8811b35520
|
2021-08-17 21:04:09 +00:00 |
|
TreeHugger Robot
|
7c24e4c338
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ca24fda21b -s ours am: 43ec6c8ea6 -s ours am: 079e6a8f23 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590119
Change-Id: I39915f0a0c9ba8b3e44c346036f11385ff4223c5
|
2021-08-17 21:03:46 +00:00 |
|
TreeHugger Robot
|
e4ee99b6ce
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 68e3878944 -s ours am: 9b2132ad58 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590111
Change-Id: I7efaa13b40afd41002f56d6a558fc9f63caf15bf
|
2021-08-17 21:03:43 +00:00 |
|
TreeHugger Robot
|
71e02e9318
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e323bfb2bc -s ours am: e03f419b66 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590971
Change-Id: I8e9de7f88c3e63a3771c68bf1c6d4bd3651d82ad
|
2021-08-17 21:03:35 +00:00 |
|
TreeHugger Robot
|
75e8e9b76c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 13fdf59374 -s ours am: e901fdc011 -s ours am: 73c6c430fc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590977
Change-Id: Ib2cfea51d822af3e2ee73c7da059346362dc90f0
|
2021-08-17 21:03:29 +00:00 |
|
TreeHugger Robot
|
6da2929d8b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 68e3878944 -s ours am: 9b2132ad58 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590111
Change-Id: I92acd03546ff8312a513742a3be829e3e99ab71c
|
2021-08-17 21:01:34 +00:00 |
|
TreeHugger Robot
|
d3e6a1533f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e323bfb2bc -s ours am: e03f419b66 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590971
Change-Id: I3649787559b3d10ae290fe6cc3fccddd9acf4ccf
|
2021-08-17 21:01:08 +00:00 |
|
TreeHugger Robot
|
9b2132ad58
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 68e3878944 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590111
Change-Id: I409137a7848ae737059e094b6541f0f4c3139820
|
2021-08-17 20:48:08 +00:00 |
|
Lucas Dupin
|
185741e47d
|
Merge "Revert "Revert "Migrate boot animation from GLES 1.0 to GLES2.0.""" into sc-qpr1-dev
|
2021-08-17 20:48:05 +00:00 |
|
TreeHugger Robot
|
e03f419b66
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e323bfb2bc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590971
Change-Id: If594f4e7931ff85e54fb9d4da8e2536c0285786f
|
2021-08-17 20:47:47 +00:00 |
|
TreeHugger Robot
|
92b073f947
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e3cbdad558 -s ours am: b009bbc13f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15598025
Change-Id: I5d653a2fe69f3d48b1f32fe84ceb80ea5787e689
|
2021-08-17 20:41:16 +00:00 |
|
TreeHugger Robot
|
079e6a8f23
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ca24fda21b -s ours am: 43ec6c8ea6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590119
Change-Id: Id6bb85b1d34bdd13e81d01e580bf156043c02f07
|
2021-08-17 20:41:07 +00:00 |
|
TreeHugger Robot
|
73c6c430fc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 13fdf59374 -s ours am: e901fdc011 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590977
Change-Id: Ib180ab0961b5435c2b22f62e98bc600570ff86d4
|
2021-08-17 20:41:00 +00:00 |
|
TreeHugger Robot
|
68e3878944
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-08-17 20:39:05 +00:00 |
|
TreeHugger Robot
|
8c877419ed
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e3cbdad558 -s ours am: b009bbc13f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15598025
Change-Id: I0ce5484e777b088f55111d98267d20efbde90381
|
2021-08-17 20:38:38 +00:00 |
|
TreeHugger Robot
|
393b4e3632
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ca24fda21b -s ours am: 43ec6c8ea6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590119
Change-Id: Iab29643809bf1122568c0fed2c58b227d3e4f905
|
2021-08-17 20:38:29 +00:00 |
|
TreeHugger Robot
|
91c6fd686c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 13fdf59374 -s ours am: e901fdc011 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590977
Change-Id: I9ca15fa3ae06a9b2367320c31523abc1be969500
|
2021-08-17 20:38:13 +00:00 |
|
TreeHugger Robot
|
e323bfb2bc
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-08-17 20:25:25 +00:00 |
|
TreeHugger Robot
|
b009bbc13f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e3cbdad558 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15598025
Change-Id: I751846a01782129638f644e4cb48ccc7eaaa8f0b
|
2021-08-17 20:21:48 +00:00 |
|
TreeHugger Robot
|
43ec6c8ea6
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ca24fda21b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590119
Change-Id: Id4c6b6ed42a14d0e324c094f0a2d26d71d1fcf34
|
2021-08-17 20:21:12 +00:00 |
|
TreeHugger Robot
|
e901fdc011
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 13fdf59374 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590977
Change-Id: I80e0afee3ffdfabfa681005687580247b543a049
|
2021-08-17 20:20:48 +00:00 |
|
Bill Yi
|
c2083a72de
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b82a396d9 -s ours am: e8dda79ee8 -s ours am: e77bf961a6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15592559
Change-Id: Id51822e52f400d1546ecab0550130456611f1bcf
|
2021-08-17 20:16:12 +00:00 |
|
Bill Yi
|
bb4a966ef0
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8723acd832 -s ours am: 94f7b89a95 -s ours am: 020d4e8ccf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15593909
Change-Id: I015f6357887cbc4ce2e7b5de5cf0823e54a9a086
|
2021-08-17 20:16:05 +00:00 |
|
TreeHugger Robot
|
ca24fda21b
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
|
2021-08-17 20:03:08 +00:00 |
|
Bill Yi
|
9873a008ce
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b82a396d9 -s ours am: e8dda79ee8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15592559
Change-Id: I73754d5e519cab2335e15f8bc2cb64d7fb30d490
|
2021-08-17 20:02:28 +00:00 |
|
TreeHugger Robot
|
13fdf59374
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
|
2021-08-17 20:02:09 +00:00 |
|
Bill Yi
|
d3f828f7de
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8723acd832 -s ours am: 94f7b89a95 -s ours am: de58315842 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15593909
Change-Id: I4c7eceab4f2b4e630b82524dc28a16bc4be0323e
|
2021-08-17 19:57:12 +00:00 |
|
Bill Yi
|
e77bf961a6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b82a396d9 -s ours am: e8dda79ee8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15592559
Change-Id: Ifcbaa3e190924feaefa3afcca852ceeeb7e2861a
|
2021-08-17 19:56:21 +00:00 |
|
Bill Yi
|
020d4e8ccf
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8723acd832 -s ours am: 94f7b89a95 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15593909
Change-Id: I87a4c8a19d680c2ea7b47c33545f1ceab727f6c5
|
2021-08-17 19:56:04 +00:00 |
|
Bill Yi
|
e8dda79ee8
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b82a396d9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15592559
Change-Id: I899d9e414d2074a4acb2294b501447727eae5405
|
2021-08-17 19:55:17 +00:00 |
|
Bill Yi
|
de58315842
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8723acd832 -s ours am: 94f7b89a95 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15593909
Change-Id: I35679870c8e48963634e5d0c53d85c346be69b72
|
2021-08-17 19:53:54 +00:00 |
|
Xin Li
|
a75effc537
|
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: e7449820a4 -s ours am: 0595a3bf92 -s ours
am skip reason: Merged-In I661f5fb6b1f3f6ce4322fab8fa84a7ab364c65b1 with SHA-1 5c822bf4ea is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15571898
Change-Id: I2e4d2e430f37c22beab47c8efd940766dce93329
|
2021-08-17 19:46:21 +00:00 |
|
Bill Yi
|
94f7b89a95
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8723acd832 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15593909
Change-Id: I0f26fa2092e7669f2064582c3b99732064740edc
|
2021-08-17 19:43:46 +00:00 |
|
TreeHugger Robot
|
e3cbdad558
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-08-17 19:43:02 +00:00 |
|
Dave Mankoff
|
1f02f1381f
|
Merge "Pause Primary Prox when Secondary Running." into sc-qpr1-dev am: 57f6f21248
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15587573
Change-Id: Ia79ad5cb73dd5bf2bdcc239f4f0d271d4cb986ef
|
2021-08-17 19:40:37 +00:00 |
|
Jeff DeCew
|
e5a0d109ef
|
Merge "Make foreground color selection in SmartReplyView and RemoteInputView match Notification." into sc-qpr1-dev am: 0c43fe4e92
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549415
Change-Id: I37f3da149d54e593ddb3ef2cc4ae3ed2a89dc4da
|
2021-08-17 19:39:54 +00:00 |
|
Dave Mankoff
|
57f6f21248
|
Merge "Pause Primary Prox when Secondary Running." into sc-qpr1-dev
|
2021-08-17 19:39:20 +00:00 |
|
Jeff DeCew
|
0c43fe4e92
|
Merge "Make foreground color selection in SmartReplyView and RemoteInputView match Notification." into sc-qpr1-dev
|
2021-08-17 18:59:51 +00:00 |
|