Commit Graph

794315 Commits

Author SHA1 Message Date
TreeHugger Robot
87770b6817 [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: 90f176b84a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff4810492b739019aedca40163bac44acb5c8679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:45:05 +00:00
Bill Yi
90928b1a23 [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: 00a096f7f1 -s ours
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I788ea348feb4ec6d71e97788a7e2a6201f6fd474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 22:34:04 +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
Shan Huang
31cf033a03 Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress This change is intentionally a no-op on master because the tag already exists on master." 2022-05-16 21:45:52 +00:00
Yan Yan
cd745de0bf Merge "Use token to identify IKE Session" am: 2775f8a1d1 am: 86c048a4d7 am: 5584c1c84b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2083849

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

Change-Id: Ic59d8564b97086ddf66e951524c86c09ef311d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 21:15:25 +00:00
Shan Huang
a1e7ce93af Add missing @Test annotation to ignoresGesture_transitionInProgress
This change is intentionally a no-op on master because the tag already
exists on master.

Test: m -j
Test: atest BackAnimationControllerTest#ignoresGesture_transitionInProgress
Bug: 232793611

Change-Id: I1738b40c8df1c9af7bb0e63586cb2e70b3c9e8ca
2022-05-16 20:59:10 +00:00
Grace Cheng
17b951441f Merge "Schedule UDFPS IPCs on the dedicated biometric thread" into tm-d1-dev am: c4d22bb342 am: f8d29d1017 am: 70cdaafd02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381963

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

Change-Id: I7c5a1a283368fd7ccc2d83b51744dc5081c679ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:53:46 +00:00
Yan Yan
2775f8a1d1 Merge "Use token to identify IKE Session" 2022-05-16 20:27:52 +00:00
Grace Cheng
70cdaafd02 Merge "Schedule UDFPS IPCs on the dedicated biometric thread" into tm-d1-dev am: c4d22bb342 am: f8d29d1017
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381963

Change-Id: I6dcef43424168968ec86c62c9e70ddef4bd724ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:26:32 +00:00
TreeHugger Robot
f5d7eff528 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: fed523d651 -s ours am: bcebb6b51a -s ours am: 6d003de9ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iacc2bda289e44797ff3256b66241d33aa27a4433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:05:37 +00:00
Bill Yi
23dd1ab1d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bd637df9ec -s ours am: 1d981c127a -s ours am: 38d3c62f51 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id367961a19ea6087dad770677f8c653e994b16e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:05:08 +00:00
TreeHugger Robot
f909b321ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0ad428d62d -s ours am: 14b37365dd -s ours am: 51275713aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8bb196ed9e80ce8d66d2d45d540f1a8053770568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:04:47 +00:00
Bill Yi
e1dad46f8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96445504e0 -s ours am: 7ffa073aa4 -s ours am: c9e561366e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I134ed7d7d939bc53b2e9f08a2bc92ae3bda87a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:04:28 +00:00
TreeHugger Robot
d0af6b6ab9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 92ac22ebf0 -s ours am: e061d41c34 -s ours am: 21b48fdcb6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c2ff664df94d82899267efff3c2cb62d7951e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:04:02 +00:00
Bill Yi
539207d708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb36b17e60 -s ours am: f27032363d -s ours am: cf2294250b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icdc22cfcaa444eff1b077baac43afd7b913cfe27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:03:32 +00:00
Grace Cheng
f8d29d1017 Merge "Schedule UDFPS IPCs on the dedicated biometric thread" into tm-d1-dev am: c4d22bb342
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381963

Change-Id: I1934169de69642e7d3b709d4c23a90b6933e8dfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:03:01 +00:00
TreeHugger Robot
59496a9472 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 35ee58ca1c -s ours am: 7362fd0a76 -s ours am: 644dfbcfed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42670157dfcc3cb1e6141f2698ec113d65a01145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:03:01 +00:00
Bill Yi
3e6da36222 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af010daf62 -s ours am: eaf14e7800 -s ours am: ccc931c344 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I49ec7594ae8417664f920400efbab0e6128c6d9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:01:51 +00:00
Bill Yi
75b651d139 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a7735bec5 -s ours am: e633f2d2e0 -s ours am: 0a2944e02c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia25537b200e71a28a95c2f8d3decdf0d3d13fe7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:01:01 +00:00
Grace Cheng
c4d22bb342 Merge "Schedule UDFPS IPCs on the dedicated biometric thread" into tm-d1-dev 2022-05-16 18:51:47 +00:00
TreeHugger Robot
6d003de9ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: fed523d651 -s ours am: bcebb6b51a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I472e06010e14eaf5b495f21b4dd8b52f0489a4da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:27:03 +00:00
Bill Yi
38d3c62f51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bd637df9ec -s ours am: 1d981c127a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I27461babfeb010e52709d7f751322a25092019ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 18:26:52 +00:00