PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,697 Commits 1 Branch 0 Tags
f16a243a19adccea599a05462773bbd427db9027
Commit Graph

93697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f16a243a19 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb 2p: 8d94de2962
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:06:14 +00:00
Bill Yi
bde95ae5bb Merge changes from topic "presubmit-am-c386f954c4484bf18ee18e18534b4765" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9b333b2dcb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:06:00 +00:00
Bill Yi
81575b3eb4 Merge changes from topic "presubmit-am-92157eaf9a0f4bcdbb408b05b9d0c9aa" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 04d698d1f6
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:05:54 +00:00
Bill Yi
7fa5eb1b73 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb 2p: 1e656787ee
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:04:16 +00:00
TreeHugger Robot
cddbe5f798 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: fbc5473058 -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: Iee7e8652d848ff8f323c0a17034496312dd14446
 2021-08-17 21:03:19 +00:00
Bill Yi
78c1fb5468 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d63b6c0428 -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: I52a7e2d2eb70b650b37405613fc7f2db43fe1d36
 2021-08-17 21:03:07 +00:00
TreeHugger Robot
bf8b916a3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours am: 8013ac32c6 -s ours am: 1b205fbb03 -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: I928b7438f8e1f50f2b03a276d8da8ef36861bc5c
 2021-08-17 20:48:53 +00:00
TreeHugger Robot
fbc5473058 [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: I9791ccc8a20c6497f2a4901dfde213e4394d0c6c
 2021-08-17 20:46:05 +00:00
Bill Yi
d63b6c0428 [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: Ib09c9a3cc1329de1014329bd2402134951076d3e
 2021-08-17 20:45:55 +00:00
TreeHugger Robot
82629e7bb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: 3c63e65b2c -s ours am: bedcd7dcf9 -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: I89b7ed9ce15d775d88ff37a256febe5f620c2c48
 2021-08-17 20:40:20 +00:00
Bill Yi
18e9683196 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 27b0252afa -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: I0464c880c88013e7a6ead0984a8981f281c2df95
 2021-08-17 20:39:43 +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
27b0252afa [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: I60a5373e66911dbf1652d49b385dd78c46ec79ac
 2021-08-17 20:20:53 +00:00
TreeHugger Robot
186c4d6e63 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-17 20:18:07 +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
TreeHugger Robot
413f1db6c6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-17 20:10:00 +00:00
TreeHugger Robot
3ceb76595f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 478207eda5 -s ours am: 2ace4acb04 -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: Id0cadc4ad8f9effaea9853c026d9a13f4bfb979b
 2021-08-17 20:07:02 +00:00
TreeHugger Robot
7ed74f52bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1c58e43cb -s ours am: 70a5bd4c62 -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: I42d5610e565014cd40e02fdef3fd1742508cbb04
 2021-08-17 20:06:56 +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
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
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
YUKAI HUNG
55eba2589c Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev am: 0a308d056b am: c4234a86a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15583411

Change-Id: Iafcdf0f301f859b4ad78b991e22f846cc9ab28a0
 2021-08-17 17:48:09 +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
1254e6b856 Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d am: 9ee42fc623 am: e016e0b03f am: e53111b6a0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I56db10cad198f321a3146b70f0f760cd71e67afd
 2021-08-17 10:01:24 +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
81c97af835 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb 2p: 8d94de2962 
Blank merge reason: parent was merged -s ours

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

Change-Id: I4dac108fb9b72bb7180e3870ac0133ee0f4138c3
 2021-08-17 05:49:52 +00:00
Bill Yi
8d94de2962 [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: I82e01f7a48919bec7e5d1d97788d7b72e239d831
 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
a9674f1e17 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I645acc726b56601af6ae2a58959dd514a1140ee2
 2021-08-16 22:44:16 -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
1f5111f15b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb 2p: 1e656787ee 
Blank merge reason: parent was merged -s ours

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

Change-Id: I28137b9f9c63c7247fbbed413bea2d7e7e080484
 2021-08-17 05:35:24 +00:00
Bill Yi
1e656787ee [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: Ia8dff8797c03100a053ce9182e4b38b4b65a6ead
 2021-08-17 05:35:19 +00:00
Bill Yi
21392f9ffb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e71e551f5efede9979e39aa215cfb597bb3135d
 2021-08-16 22:35:06 -07:00