Commit Graph

669147 Commits

Author SHA1 Message Date
Evan Chen
b2256d546d [automerger skipped] Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162dfb8 am: 37d7f20996 am: 646b7c72ef am: 8bff0b573f -s ours am: 401b2e2fe0 -s ours am: 730d1b6088 -s ours am: 2dc1fe2034 -s ours
am skip reason: skipped by user evanxinchen

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

Change-Id: Iae8441632229722f311f8e8bd3a06bfe29e42d9f
2021-09-09 16:31:39 +00:00
Automerger Merge Worker
f192b57cd5 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5055933564 -s ours am: 2a3e558f9e -s ours am: b37a118f1b -s ours am: 0543c693db -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:31:35 +00:00
Aseem Kumar
f97ac6ff99 [automerger skipped] Prevent apps from spamming addAccountExplicitly. am: 551d70e1c8 am: 662fcc58ef -s ours am: 9290f7b31f -s ours am: ef4197a103 -s ours am: 4b8d2c671b -s ours am: 7bfdc11b72 -s ours am: d6cb9820fc -s ours
am skip reason: skipped by user aseemk

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

Change-Id: Ie259c802987d1883aebf473a49d73a33d19552f9
2021-09-09 16:31:29 +00:00
TreeHugger Robot
9f296c1bc7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5055933564 -s ours am: 2a3e558f9e -s ours am: b37a118f1b -s ours am: 0543c693db -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2d99fcf6228927fa163d4a577b95977ca219c62
2021-09-09 16:31:29 +00:00
Automerger Merge Worker
2349add3b1 Merge "[automerger skipped] Prevent apps from spamming addAccountExplicitly. am: 551d70e1c8 am: 662fcc58ef -s ours am: 9290f7b31f -s ours am: c75430ebfb -s ours am: aa390948a0 -s ours am: c28c8ea4c3 -s ours am: 14a63e16ec -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:31:24 +00:00
Automerger Merge Worker
0372fc7134 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 63d036abaf -s ours am: 1b10fac772 -s ours am: 4916b75a24 -s ours am: 60b4e87c9e -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:31:23 +00:00
Aseem Kumar
032c282ad5 [automerger skipped] Prevent apps from spamming addAccountExplicitly. am: 551d70e1c8 am: 662fcc58ef -s ours am: 9290f7b31f -s ours am: c75430ebfb -s ours am: aa390948a0 -s ours am: c28c8ea4c3 -s ours am: 14a63e16ec -s ours
am skip reason: skipped by user aseemk

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

Change-Id: Ibc19be495564f6f0419dd933f44ef0b605547882
2021-09-09 16:31:20 +00:00
TreeHugger Robot
ae9a70e747 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 63d036abaf -s ours am: 1b10fac772 -s ours am: 4916b75a24 -s ours am: 60b4e87c9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I533afe85a5a797adb9cd5d7a8bab1d280224d8b5
2021-09-09 16:31:17 +00:00
Automerger Merge Worker
844db98620 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3663950f3c -s ours am: 84f78a5530 -s ours am: 8e343e0b62 -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:31:16 +00:00
Bill Yi
3c90bdeda3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3663950f3c -s ours am: 84f78a5530 -s ours am: 8e343e0b62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2891c83e2e0a65f76bb1208050439276f8d594d
2021-09-09 16:31:09 +00:00
TreeHugger Robot
564f7fc2d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6e0cefffae -s ours am: b1b6941a46 -s ours am: 9b94f4b8ec -s ours am: 284bfed29e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88e77afd8b960d545e1a6d358a9745dc1c81606c
2021-09-09 16:31:05 +00:00
Automerger Merge Worker
45a9aeb6cd Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 81c42be526 -s ours am: 392fc0dd9e -s ours am: fe6cceab9d -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:31:01 +00:00
TreeHugger Robot
cef00b7806 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 81c42be526 -s ours am: 392fc0dd9e -s ours am: fe6cceab9d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifcb2affcb28f1239f78d9dfe7d5c0d9ac3801b4d
2021-09-09 16:30:57 +00:00
TreeHugger Robot
18115ab95d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5838cde73d -s ours am: 28b5f57033 -s ours am: 3c4344b02c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic91e008ca3a2c8ca581de020420fb8a5c061c067
2021-09-09 16:30:54 +00:00
Automerger Merge Worker
b41b4cae21 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9b2facfc0f -s ours am: 3d5be79b08 -s ours am: 75661421d0 -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:30:52 +00:00
Automerger Merge Worker
f501c61b59 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e0d062275e -s ours am: 66a2fc6e88 -s ours am: 380348fa7d -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:30:48 +00:00
TreeHugger Robot
8615196297 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9b2facfc0f -s ours am: 3d5be79b08 -s ours am: 75661421d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibfeaf6cd783d0c3d2cb75b9378bc326e58aaad05
2021-09-09 16:30:48 +00:00
TreeHugger Robot
2f84b164ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e0d062275e -s ours am: 66a2fc6e88 -s ours am: 380348fa7d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3589d8bb5f33915fe3dfe5c3a3b6b9fa14797cb3
2021-09-09 16:30:41 +00:00
TreeHugger Robot
ca285aa756 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5055933564 -s ours am: 2a3e558f9e -s ours am: b37a118f1b -s ours am: b1770bbb96 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94cc7f4b26e1ed7fb658a8c8b155ecc7d1e7bc6f
2021-09-09 16:30:38 +00:00
Automerger Merge Worker
c0088d8e52 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 63d036abaf -s ours am: 1b10fac772 -s ours am: 4916b75a24 -s ours am: 92b00d98f6 -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:30:33 +00:00
TreeHugger Robot
a01945cb05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 63d036abaf -s ours am: 1b10fac772 -s ours am: 4916b75a24 -s ours am: 92b00d98f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I146315ec91d82531fe671f2fbfb8989387da4d40
2021-09-09 16:30:30 +00:00
TreeHugger Robot
a0166ed1f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ac707691f4 -s ours am: bd805ca304 -s ours am: b2cb6a3200 -s ours am: 910816290a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23b689b123b3591fad7aa691ccf809e6c068610b
2021-09-09 16:30:27 +00:00
Automerger Merge Worker
95ac1313d5 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6e0cefffae -s ours am: b1b6941a46 -s ours am: 9b94f4b8ec -s ours am: 752a772763 -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:30:22 +00:00
TreeHugger Robot
6c1ea01eac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6e0cefffae -s ours am: b1b6941a46 -s ours am: 9b94f4b8ec -s ours am: 752a772763 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5cd956cd9993e5719bbdbf6a5384ab135f4a5b7f
2021-09-09 16:30:18 +00:00
TreeHugger Robot
ffae324c52 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8ec83bfa97 -s ours am: 423419525a -s ours am: 8cae9895c7 -s ours am: ef7ac10ad7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0da55900a53feaad82665e5bfbae7823c0a6e3ff
2021-09-09 16:30:16 +00:00
Automerger Merge Worker
d6dcb2bb60 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5838cde73d -s ours am: 28b5f57033 -s ours am: 30723964f5 -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:30:13 +00:00
Automerger Merge Worker
5a37450e10 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9f0479e440 -s ours am: e18e2a4590 -s ours am: cb6d6629b8 -s ours am: 80a949ef22 -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:30:10 +00:00
TreeHugger Robot
f83d949990 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5838cde73d -s ours am: 28b5f57033 -s ours am: 30723964f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I11634462b61f48c9ae765a23c7abaffc73ec4c86
2021-09-09 16:30:09 +00:00
TreeHugger Robot
611a98c509 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9f0479e440 -s ours am: e18e2a4590 -s ours am: cb6d6629b8 -s ours am: 80a949ef22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26ecf5e9b1fcafaa266e1d27b6f7365ca68abdc0
2021-09-09 16:30:04 +00:00
TreeHugger Robot
c468d5435e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e0d062275e -s ours am: 66a2fc6e88 -s ours am: bef08f07db -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03238c62a4b24045c7e605d5cb8e347209c34fd5
2021-09-09 16:30:01 +00:00
Automerger Merge Worker
0f9859fbfe Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9c893d6adb -s ours am: 79e2dcac5d -s ours am: df84ad61bb -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:29:58 +00:00
TreeHugger Robot
f5c856d034 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9c893d6adb -s ours am: 79e2dcac5d -s ours am: df84ad61bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I56c7e58595f02bad07402e6e8b7a1bd51080932c
2021-09-09 16:29:50 +00:00
TreeHugger Robot
1056c280ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ac707691f4 -s ours am: bd805ca304 -s ours am: b2cb6a3200 -s ours am: 69a6af424e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62b91adf1b4f0db83b55b7411a7f234aae365e6c
2021-09-09 16:29:47 +00:00
Automerger Merge Worker
1b62417bac Merge "[automerger skipped] Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd7b -s ours am: 4b46645055 -s ours am: 5edce7f4c3 -s ours" into sc-v2-dev-plus-aosp 2021-09-09 16:29:45 +00:00
TreeHugger Robot
7389df95d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8ec83bfa97 -s ours am: 423419525a -s ours am: 8cae9895c7 -s ours am: c6181286c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief7fcd6e2ac16c607773192ce88b93ae8b52a261
2021-09-09 16:29:37 +00:00
Joshua Mccloskey
85e03612d0 [automerger skipped] Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd7b -s ours am: 4b46645055 -s ours am: 5edce7f4c3 -s ours
am skip reason: skipped by user joshmccloskey

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

Change-Id: Icbda575595c55379bb40c7e69cf825c64f933df0
2021-09-09 16:29:29 +00:00
TreeHugger Robot
3aad0dce4f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9f0479e440 -s ours am: e18e2a4590 -s ours am: cb6d6629b8 -s ours am: fee1ed1d9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic92ea2c79ab5d967d2830206c39a972dd9a88a8e
2021-09-09 16:29:24 +00:00
TreeHugger Robot
36079465c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9c893d6adb -s ours am: 79e2dcac5d -s ours am: 717ad1d5d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I60dcde12ad9287f3170f5a8bf1ceca38a44395a1
2021-09-09 16:29:13 +00:00
Joshua Mccloskey
d7f242b248 [automerger skipped] Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd7b -s ours am: 4b46645055 -s ours am: ca6f0cb6cd -s ours
am skip reason: skipped by user joshmccloskey

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

Change-Id: I73cdd3ef28f7011e9396617d9a91168967f89d9a
2021-09-09 16:28:52 +00:00
Evan Chen
2dc1fe2034 [automerger skipped] Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162dfb8 am: 37d7f20996 am: 646b7c72ef am: 8bff0b573f -s ours am: 401b2e2fe0 -s ours am: 730d1b6088 -s ours
am skip reason: skipped by user evanxinchen

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

Change-Id: If9e4302b6d61854532c7a7e757ac7684359d7e25
2021-09-09 16:19:37 +00:00
Aseem Kumar
d6cb9820fc [automerger skipped] Prevent apps from spamming addAccountExplicitly. am: 551d70e1c8 am: 662fcc58ef -s ours am: 9290f7b31f -s ours am: ef4197a103 -s ours am: 4b8d2c671b -s ours am: 7bfdc11b72 -s ours
am skip reason: skipped by user aseemk

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

Change-Id: I78420c7dd509cd1e5d55fe320a1c9f7b19c27407
2021-09-09 16:19:26 +00:00
Aseem Kumar
14a63e16ec [automerger skipped] Prevent apps from spamming addAccountExplicitly. am: 551d70e1c8 am: 662fcc58ef -s ours am: 9290f7b31f -s ours am: c75430ebfb -s ours am: aa390948a0 -s ours am: c28c8ea4c3 -s ours
am skip reason: skipped by user aseemk

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

Change-Id: I494d1e42dbd57bc5e60086e8582ccede0fc64429
2021-09-09 16:19:16 +00:00
Bill Yi
8e343e0b62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3663950f3c -s ours am: 84f78a5530 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb6ce2a003a39a8d93808058d4bb03bdf163550c
2021-09-09 16:19:06 +00:00
TreeHugger Robot
fe6cceab9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 81c42be526 -s ours am: 392fc0dd9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4bb9b011b1a77e93b8833f09324b913c11d3bdf6
2021-09-09 16:18:54 +00:00
TreeHugger Robot
75661421d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9b2facfc0f -s ours am: 3d5be79b08 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26d5f894882e895d295310fdafd279bfa777b4c3
2021-09-09 16:18:43 +00:00
TreeHugger Robot
b1770bbb96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5055933564 -s ours am: 2a3e558f9e -s ours am: b37a118f1b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0ab3124be744ece5253eda73887f72c5a21cfdc
2021-09-09 16:18:32 +00:00
TreeHugger Robot
92b00d98f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 63d036abaf -s ours am: 1b10fac772 -s ours am: 4916b75a24 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4984c59cebb21dcc66ddb35e1714559ef03532d7
2021-09-09 16:18:20 +00:00
TreeHugger Robot
752a772763 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6e0cefffae -s ours am: b1b6941a46 -s ours am: 9b94f4b8ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5212cd379a71f42d28dd25bfbf27bfa619f9254f
2021-09-09 16:18:09 +00:00
TreeHugger Robot
30723964f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5838cde73d -s ours am: 28b5f57033 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I29593cbf9bcaeadd8df1e4b9fa8e0cb188d3ab43
2021-09-09 16:17:56 +00:00
TreeHugger Robot
0543c693db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5055933564 -s ours am: 2a3e558f9e -s ours am: b37a118f1b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie187b609b4851fb5f43599ba3fd14732884f5f37
2021-09-09 16:17:53 +00:00