Commit Graph

86831 Commits

Author SHA1 Message Date
TreeHugger Robot
6ac0521fc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590649

Change-Id: I88aba12bc51f3ee79ba47c76e85271afd8733453
2021-08-17 21:03:57 +00:00
TreeHugger Robot
99036fe183 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590649

Change-Id: I0a49e72f34de52b0a39ae50d4e0d564bdbd02ee6
2021-08-17 21:03:52 +00:00
Bill Yi
0ffadc1caf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590652

Change-Id: Ib3c5fb241235d33f07b0cd6adae4a3a850b69c9b
2021-08-17 21:03:39 +00:00
Bill Yi
9f379245bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590652

Change-Id: I3d53c0eed511682b23520262314690929a492ae8
2021-08-17 21:03:37 +00:00
Bill Yi
c8aa2fc52f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours am: 48bd94aad3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657

Change-Id: Ib9296ac54c3bf5fa98c33bf8a4e0071621d707c0
2021-08-17 21:02:30 +00:00
Bill Yi
7c14455c8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours am: baf3a8b3bd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657

Change-Id: I7cbf40fcdb457efb7b39af434187fecbef133e97
2021-08-17 20:50:02 +00:00
TreeHugger Robot
fe24c2c1ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours am: ed4f4693c2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591584

Change-Id: I196bd571dfac2a55fd323b9819a970a93e8027c3
2021-08-17 20:49:08 +00:00
TreeHugger Robot
150a09b784 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: d9754e6900 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591591

Change-Id: I65b313f804bfb11004e0af089fe097e2c2832572
2021-08-17 20:48:39 +00:00
TreeHugger Robot
085d3c9360 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590649

Change-Id: I8a40984c311e385afd08a66cd0f397391a8097fd
2021-08-17 20:47:16 +00:00
Bill Yi
d02406dbe7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590652

Change-Id: I7211a697224d6da927389795fee3ba9d109a32ca
2021-08-17 20:47:02 +00:00
TreeHugger Robot
345eec506d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590649

Change-Id: I01f4d67deebe14482f976ff3086484ed79ed75ce
2021-08-17 20:43:37 +00:00
Bill Yi
f8f7afe889 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590652

Change-Id: I430230645a0bd690921bb35d762c792ec73bbfbc
2021-08-17 20:43:27 +00:00
Bill Yi
48bd94aad3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657

Change-Id: I648805cff2ca54f29e9c5b1c95ae8aab35990052
2021-08-17 20:40:47 +00:00
Bill Yi
baf3a8b3bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657

Change-Id: Iad888f0320d8301f19628debbd9ad2cc37cf301b
2021-08-17 20:40:45 +00:00
Xin Li
7238a80218 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours am: c1853be4d0 -s ours am: 0313c67921 -s ours
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15571802

Change-Id: I167be22eeb7eaf97356aa60928b5f63bca23d291
2021-08-17 20:32:38 +00:00
TreeHugger Robot
9aeb396178 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590649

Change-Id: I7b04dbbc9369c89ca837fe2dccb86a3c9445dbdb
2021-08-17 20:28:48 +00:00
Bill Yi
3e49192ffc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590652

Change-Id: I983cb558895e64cd0455dbe51eb169e0fe7bd634
2021-08-17 20:28:41 +00:00
Bill Yi
02b5415b3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657

Change-Id: I21a0af17579c11c689e78382f4fe1e16bc91b416
2021-08-17 20:21:42 +00:00
Bill Yi
1ca3b46718 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657

Change-Id: I0fd26a73fa93e5e592efc6d2259bd9e83dac2b04
2021-08-17 20:18:16 +00:00
TreeHugger Robot
1b205fbb03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours am: 8013ac32c6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591584

Change-Id: Ie6c607caee526934a3881076ef940b82e65d27fc
2021-08-17 20:15:11 +00:00
TreeHugger Robot
bedcd7dcf9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: 3c63e65b2c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591591

Change-Id: I9ff0cd7576de8189386738962d9178696784125f
2021-08-17 20:15:06 +00:00
TreeHugger Robot
dd0e1a338c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-17 20:14:28 +00:00
Bill Yi
fa3505fdd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657

Change-Id: Ib5eb493e9092ee4f57bea4cc9238a995284b1cf8
2021-08-17 20:06:51 +00:00
TreeHugger Robot
ed4f4693c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591584

Change-Id: Ia9a9c923f760ac6cd829b2606f84c57c2b5ae0cd
2021-08-17 19:56:50 +00:00
TreeHugger Robot
d9754e6900 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591591

Change-Id: I2a8a5b3f77780d0b5923784cf7360869a5929ea0
2021-08-17 19:56:23 +00:00
TreeHugger Robot
8013ac32c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591584

Change-Id: Iacbf620cd9e7bfffe08a9027ccdcee0e9e2f47d9
2021-08-17 19:56:21 +00:00
TreeHugger Robot
3c63e65b2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591591

Change-Id: I45e2a124c17b21a9202e6101dbb645c62a62522e
2021-08-17 19:56:03 +00:00
TreeHugger Robot
2ace4acb04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 478207eda5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591592

Change-Id: I365e1ea376400e8027b52a72f095dae5797347f7
2021-08-17 19:50:01 +00:00
TreeHugger Robot
70a5bd4c62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1c58e43cb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591585

Change-Id: I762388b6d96ba80d2f5c632dc16ce812c607aad1
2021-08-17 19:49:47 +00:00
Xin Li
0313c67921 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours am: c1853be4d0 -s ours
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15571802

Change-Id: I1456d89f8a7d4bbc347715fbf9ac8150db07e075
2021-08-17 19:46:34 +00:00
TreeHugger Robot
1bdc58284d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-17 19:46:30 +00:00
TreeHugger Robot
6a41d25bcc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-17 19:44:13 +00:00
TreeHugger Robot
478207eda5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-17 19:39:11 +00:00
TreeHugger Robot
a1c58e43cb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-17 19:31:32 +00:00
Xin Li
c1853be4d0 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15571802

Change-Id: Ib85f7f13d04e651389e95994dd4854b92292a34b
2021-08-17 18:36:03 +00:00
Xin Li
7d646a5182 Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master 2021-08-17 18:14:14 +00:00
YUKAI HUNG
c4234a86a8 Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev am: 0a308d056b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15583411

Change-Id: I547b749bf8186e08ef33f7eb7635842b4895d1c8
2021-08-17 17:27:51 +00:00
YUKAI HUNG
0a308d056b Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev 2021-08-17 17:10:26 +00:00
Treehugger Robot
e53111b6a0 Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d am: 9ee42fc623 am: e016e0b03f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I49dcaf8ffe6c206087ac920b18fa73f36a2c2a39
2021-08-17 09:48:26 +00:00
Treehugger Robot
e016e0b03f Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d am: 9ee42fc623
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I4e704c29fa65197dbe1ba6e6471d925c0ad19a60
2021-08-17 09:37:38 +00:00
Treehugger Robot
9ee42fc623 Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I56890f77bf79e84953a0ce01f2cec4089682fbf4
2021-08-17 09:22:56 +00:00
Treehugger Robot
2fbbcd3d9d Merge "Add biometric OWNERS to unit tests." am: 9689490c22
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I355edf3a1ff7efb93a3c8eff94bb77104e60a5cb
2021-08-17 09:12:11 +00:00
Treehugger Robot
9689490c22 Merge "Add biometric OWNERS to unit tests." 2021-08-17 08:43:12 +00:00
Bill Yi
7ff4b20c22 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1a80b91df8a3a635763fc178757662a07df3874a
2021-08-16 22:59:49 -07:00
Bill Yi
73f4597617 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib8067f7f7b9ce0b3c3c9b164c16c2124754259f4
2021-08-16 22:54:27 -07:00
Bill Yi
635d7a2949 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: I4c5f57616aa0bda605f4fcd4f7de90a6c8b64853
2021-08-17 05:49:49 +00:00
Bill Yi
d1e4f888fb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icabf059c62f547d2bf1bef0bc04e8e22d1613bc9
2021-08-16 22:49:25 -07:00
Bill Yi
33816cbd55 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icc69636a8f76732319cc24c5bf7e842150ab5692
2021-08-16 22:39:23 -07:00
Bill Yi
d49b8b74d0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibe35735e2e3ab8087dfc0f2303e4b32318ac95a3
2021-08-16 22:37:14 -07:00
Bill Yi
cd0d73535b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: Iab4d8828f2a190ed85f24dc2ec2f58f7082744f3
2021-08-17 05:35:19 +00:00