Commit Graph

773407 Commits

Author SHA1 Message Date
Xusong Wang
c5a70b44a7 [automerger skipped] Merge "Fix bug in Blend that did not use options." am: 92ce74409b am: 4fa761b913 -s ours am: 003fbea428 -s ours am: d09316ddbf -s ours
am skip reason: Merged-In Ide2fef96137ffd89e4431cf15be5df398036d909 with SHA-1 a2c6eb2f1a is already in history

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

Change-Id: I852643132d756f4289e2f46aed717d0dbf1f8303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 00:09:11 +00:00
Automerger Merge Worker
e0fcf466e3 Merge "[automerger skipped] Merge "Resize PiP on display density dpi change" into tm-d1-dev am: 1061cb16e0 am: 721fa921ef -s ours" into tm-qpr-dev-plus-aosp 2022-05-16 23:56:32 +00:00
Hongwei Wang
ae874c3072 [automerger skipped] Merge "Resize PiP on display density dpi change" into tm-d1-dev am: 1061cb16e0 am: 721fa921ef -s ours
am skip reason: Merged-In I9797197a63ed9574caaba7319d0b058821bdab36 with SHA-1 23e05492ba is already in history

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

Change-Id: I4b7c3d7125daad5a669a399a26f0e7484f1f9839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 23:56:22 +00:00
Hongwei Wang
9d4791753e [automerger skipped] Merge "Resize PiP on display density dpi change" into tm-d1-dev am: 1061cb16e0 -s ours am: aff4831113 -s ours
am skip reason: Merged-In I9797197a63ed9574caaba7319d0b058821bdab36 with SHA-1 23e05492ba is already in history

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

Change-Id: I26375752c1f90695996bc9ab544b6c0407a411e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 23:56:16 +00:00
Hongwei Wang
7d0e07188d [automerger skipped] Resize PiP on display density dpi change am: 7e36bd25a3 -s ours am: 109b585c12 -s ours
am skip reason: Merged-In I9797197a63ed9574caaba7319d0b058821bdab36 with SHA-1 23e05492ba is already in history

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

Change-Id: Iaff9afb18d1b9ed308656e849f51fc7087ab2953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 23:56:03 +00:00
Xusong Wang
d09316ddbf [automerger skipped] Merge "Fix bug in Blend that did not use options." am: 92ce74409b am: 4fa761b913 -s ours am: 003fbea428 -s ours
am skip reason: Merged-In Ide2fef96137ffd89e4431cf15be5df398036d909 with SHA-1 a2c6eb2f1a is already in history

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

Change-Id: I6fe6cd7db086a148e4ae05b71770b8a4193281e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 23:40:05 +00:00
Hongwei Wang
721fa921ef Merge "Resize PiP on display density dpi change" into tm-d1-dev am: 1061cb16e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18411684

Change-Id: I51db44f71b1d5e324abf1bbdec8c9c8b51a489d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 23:39:46 +00:00
Hongwei Wang
aff4831113 [automerger skipped] Merge "Resize PiP on display density dpi change" into tm-d1-dev am: 1061cb16e0 -s ours
am skip reason: Merged-In I9797197a63ed9574caaba7319d0b058821bdab36 with SHA-1 23e05492ba is already in history

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

Change-Id: I6d6881e34a171bffcee76f4594aebe7671458511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 23:39:42 +00:00
Hongwei Wang
109b585c12 [automerger skipped] Resize PiP on display density dpi change am: 7e36bd25a3 -s ours
am skip reason: Merged-In I9797197a63ed9574caaba7319d0b058821bdab36 with SHA-1 23e05492ba is already in history

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

Change-Id: I3444f5b4e635713118cecff891076d4106eb69da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 23:39:32 +00:00
Xusong Wang
003fbea428 [automerger skipped] Merge "Fix bug in Blend that did not use options." am: 92ce74409b am: 4fa761b913 -s ours
am skip reason: Merged-In Ide2fef96137ffd89e4431cf15be5df398036d909 with SHA-1 a2c6eb2f1a is already in history

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

Change-Id: I01bdbb0089f6377ab9640a4e4acb0adf0469dfac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 23:23:50 +00:00
Hongwei Wang
1061cb16e0 Merge "Resize PiP on display density dpi change" into tm-d1-dev 2022-05-16 23:21:19 +00:00
Xusong Wang
4fa761b913 Merge "Fix bug in Blend that did not use options." am: 92ce74409b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2097598

Change-Id: Ieafdd7757f2153001a439dcf015832fd528d3fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 23:05:17 +00:00
Xusong Wang
92ce74409b Merge "Fix bug in Blend that did not use options." 2022-05-16 22:40:50 +00:00
Grace Cheng
6c9a223822 Merge "Schedule UDFPS IPCs on the dedicated biometric thread" into tm-d1-dev am: c4d22bb342 am: d837d55a3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381963

Change-Id: Iad8220333ee68294962816b04ba9432c01fc112f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:26:50 +00:00
TreeHugger Robot
182e4ad4c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d71c0b1595 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id71baec202edfe3d16976f5691b1b5ebf3d8074c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:26:09 +00:00
Bill Yi
a8a5677230 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 332d627f82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3cffb492cb6aa49b9223d2c8083f86b29339ca92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:26:05 +00:00
TreeHugger Robot
96741f96bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 43e9f16851 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ae2cd3f4a665ab8d888e12b151c227dc22c6650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:25:50 +00:00
Bill Yi
1fce86d91d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0f531913c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I076cefabb73b764923e5bddad491caf589af4ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:25:47 +00:00
TreeHugger Robot
2ba04c30f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 405041aafc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7fcada1c94c5eb28a4c99b126a86e809159aad4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:25:45 +00:00
Bill Yi
2f5cc9ed94 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3e5f25ab36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia612a52cb27b41605e97550c64c2dd3ae2707080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:25:38 +00:00
TreeHugger Robot
f636916d93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 064cc7ff71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31f87c5671acfa93932d1e8aaffbb19a6ea0864d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:25:36 +00:00
Bill Yi
f5a4fddcdb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7123228812 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88ba2aa4c53e411261cbcd05f19d2a208668c60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:25:22 +00:00
TreeHugger Robot
485e83c089 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 401e8633b2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I655afc8ec13a337c3374d60e97f11931a02d4537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:24:47 +00:00
Bill Yi
e702995a35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0cc77e019 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9677ec52ea0ec8832c96d0f1a472a5ca3d571623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:24:18 +00:00
TreeHugger Robot
8ff70495df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: fed523d651 -s ours am: 79f2546229 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I018e7e0f94a7bebff194f0929e4a434e70ac9d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:19:13 +00:00
Bill Yi
b6b579fa3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bd637df9ec -s ours am: db802595d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib002e953acfd8aab1e158a4a37c61a51063a01f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:19:09 +00:00
TreeHugger Robot
4654293fc7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0ad428d62d -s ours am: 9436939161 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8fc99bb29f6a3cfa6ac59e7fb71dc2473b641cf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:19:06 +00:00
Bill Yi
2642f1b1b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96445504e0 -s ours am: f79c345c64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6a35cceb1fcdb49e513a5dc04a4b42af180b65a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:19:03 +00:00
TreeHugger Robot
cf4f7ecaf7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 92ac22ebf0 -s ours am: 026819b7ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33e5acbd8ac136f5187a30c89d1b3529bf16eab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:19:00 +00:00
Bill Yi
3ec158516a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb36b17e60 -s ours am: eed2020883 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I382a39cbbc6fb901cc7371d48c9ab93bf95ef141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:18:46 +00:00
TreeHugger Robot
15fed4866c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 35ee58ca1c -s ours am: 31b4ac170f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b745c273437336954adcf43795c54008fba95cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:18:35 +00:00
Bill Yi
a174a5ca22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af010daf62 -s ours am: 4adc2aae9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2102f5daedc9c79a0f661783a73c7a2eb0ac66ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:18:25 +00:00
TreeHugger Robot
4378f9d54f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 6d2931070d -s ours am: d9b02137e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I745deb30194966ba2fac97022e2315ca5842ff6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:18:06 +00:00
Bill Yi
bb0277399c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a7735bec5 -s ours am: f79905343a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2dd74992a32d22a10f3868602895c9771311083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:17:39 +00:00
TreeHugger Robot
502089d15c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3093ceacb7 -s ours am: ff15726818 -s ours am: b2b23b395d -s ours am: 7e9aac78ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ec8c16838d36bfca387a3aab2ee655abffb5ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:16:29 +00:00
Bill Yi
00a8a3b2ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3778a5ede2 -s ours am: 8083249fe4 -s ours am: 2d1ca5cbbc -s ours am: 632e314881 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55e586df2c079ec275b3e940370e435f9c66e5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:16:16 +00:00
TreeHugger Robot
90f176b84a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 66b5dd03b5 -s ours am: e29b417e82 -s ours am: f85443cc2e -s ours am: 1cc5254dac -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide9952eac99db07365544bf5bad83dc4b0425b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:16:07 +00:00
Bill Yi
00a096f7f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3e4b5d515d -s ours am: 963a53ac79 -s ours am: fad0a66bc4 -s ours am: ce746dc2ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0013df51e4a14bb7080ea1230792f71adf4b7be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:15:53 +00:00
Prabir Pradhan
8d64c685d0 Merge "Consolidate testing for input changes" into tm-dev am: 648717a3b1 am: 978c20b808 am: a2436c7ed1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186410

Change-Id: I50a4c7e8517d07051c6b1e142a147147488c6da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:15:15 +00:00
Yalan Yiue
580bf03a01 Merge "Fix clipping of QS tiles in large screen portrait shade" into tm-qpr-dev am: 2216da172e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349756

Change-Id: If8fd2eb35d0a00e6401238ee4a17dcb78d4f74bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:14:56 +00:00
Michał Brzeziński
f665eb0033 Merge "Updating QS state to default when going from or to split shade" into tm-dev am: 9568bd96c1 am: 9c4f673ed6 am: 80e8cb4403
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321325

Change-Id: Ic489dc0820ede07764b14a0add6bbf1fcb7ef3d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:14:43 +00:00
Vincent Wang
e8c7b7b497 Merge "Fix face unlock does not work for top app in split screen" into tm-dev am: 16ebd44e9f am: b32cf8c8ef am: af4095c1c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157285

Change-Id: I01a81afc90c2a2bfc403fe8530d5480124241914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:14:18 +00:00
Wei Sheng Shih
161ba7b67a Merge "Extend splash screen exception list to T" into tm-dev am: a92124a41e am: e52fa61538 am: 828c6dce47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185289

Change-Id: Iaa8a05a9810198df6f7e1cb5b7d3bff34ad5cafe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:13:52 +00:00
TreeHugger Robot
1dfb8e9460 Merge "PBAP: Do not set phonebook access to ACCESS_REJECTED automatically" into tm-dev am: 4cd19a7ece am: 8bedbeb9b5 am: a09a76a726
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349816

Change-Id: I14740c1a17b3d3f7d345a5e7647aa6476cd768bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:13:36 +00:00
TreeHugger Robot
9d4d88beaa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7cd78b1f1c -s ours am: e4093ef364 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib972b87a471b63748b16f8f3f7f3cfb863539062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:12:08 +00:00
Bill Yi
68a365cc97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb73eeeb8c -s ours am: 7d95bd4048 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82ac07ae3fc16917b413887367ae59b7008ea9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:11:46 +00:00
Tony Huang
ab6067b959 Merge "Remove supportsSplitScreenMultiWindow" into tm-qpr-dev am: 0a066377f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281748

Change-Id: I169bbfeb5ef1b5769f8de750371528f479192a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:11:01 +00:00
TreeHugger Robot
ff7a6963fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1b69099c10 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7005efca2dfceec98bbf86f3383dfae1a7f4c614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:07:41 +00:00
Bill Yi
55cf7a4328 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a2d4cc1b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7ede2378c728621106fab779dc4ab38a1920b928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:07:06 +00:00
Yan Yan
c5a10af88d Merge "Use token to identify IKE Session" am: 2775f8a1d1 am: 86c048a4d7 am: 5584c1c84b am: cd745de0bf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2083849

Change-Id: I180fe5176a83f822590332bbe961d72a31857077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:06:31 +00:00