PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,660 Commits 1 Branch 0 Tags
c33f69673a6392d0def60b7c8d6f6129f417db0c
Commit Graph

78660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
537c730ca2 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c3d91f901bc38554732ff2cc428232f117efea0
 2020-12-08 23:27:51 +00:00
TreeHugger Robot
721f43dcdc Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev 2020-12-08 22:56:46 +00:00
Ulya Trafimovich
202ca49dfe Add <uses-library> information. 
The required <uses-library> "org.apache.http.legacy" is in the manifest
for Settings. It is necessary to explicitly add it to `uses_libs`
because it is not among the app dependencies (so Soong does not add it
automatically to the manifest_fixer). It also doesn't add it as a
compatibility library because the target API level for the app is not
below 28.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Test: m out/soong/.intermediates/packages/apps/Settings/Settings/android_common/manifest_check/AndroidManifest.xml
Test: m out/soong/.intermediates/packages/apps/Settings/tests/robotests/SettingsRoboTestStub/android_common/manifest_check/AndroidManifest.xm
Change-Id: Id5d5fe1dff68cf6fce667a00e35710cf0e667d02
 2020-12-08 12:09:53 +00:00
tim peng
df9845b438 [automerger skipped] Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 3cea72fb2b am: c93b70e3a0 -s ours 
am skip reason: Change-Id I1038e237113f433c847aff98a45b1dd6089d80a8 with SHA-1 82d45fa032 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14386f71b47d402dd85c1f4e4b6ab8eddedc06fa
 2020-12-08 06:48:21 +00:00
timhypeng
5f4826dec0 [automerger skipped] Update rule of launching media output dialog am: 6472c98ffa am: 3273b4ebb4 -s ours 
am skip reason: Change-Id I16732f625f100b259d6e53c85db40af0ec1652c5 with SHA-1 eee759ea29 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68f9fcfc2ace6581513f54c44fa4d0df2d05fa5e
 2020-12-08 06:48:19 +00:00
timhypeng
76bf99ed57 [automerger skipped] Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings am: 7127fff467 am: c26d9f3d48 -s ours 
am skip reason: Change-Id Ib6c86067522925c439f336644e4d027dbae3379c with SHA-1 3084d063f3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibeb559b38ec768833f710b84a94131a9f536ad90
 2020-12-08 06:48:17 +00:00
timhypeng
8531af0b96 [automerger skipped] Add PairNewBluetoothReceiver to launch Bluetooth pairing page am: 6afe358556 am: 3254d59f0f -s ours 
am skip reason: Change-Id I16767af3afb05eab7246be133011bc9148909d11 with SHA-1 c3bd801a89 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06aac0a336c661e74443d7c963b78234eb3a72e7
 2020-12-08 06:48:14 +00:00
tim peng
c93b70e3a0 Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 3cea72fb2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0416c3b3f9ce31ed35ba07363a519b15a4a0d0d
 2020-12-08 06:28:52 +00:00
timhypeng
3273b4ebb4 Update rule of launching media output dialog am: 6472c98ffa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115229

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaeec1436e45b25fce4a4ef08155d35b8b047d916
 2020-12-08 06:28:50 +00:00
timhypeng
c26d9f3d48 Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings am: 7127fff467 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115228

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0fc610e5b5f17f9788fc12b96d2871c20be9725
 2020-12-08 06:28:49 +00:00
timhypeng
3254d59f0f Add PairNewBluetoothReceiver to launch Bluetooth pairing page am: 6afe358556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115227

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bce385da81472db27ebe07634e0ad9f0507e47f
 2020-12-08 06:28:46 +00:00
tim peng
3cea72fb2b Merge changes from topic "media_output_dialog" into rvc-qpr-dev 
* changes:
  Redirect to output switcher panel to the new dialog
  Update rule of launching media output dialog
  Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
  Add PairNewBluetoothReceiver to launch Bluetooth pairing page
 2020-12-08 05:46:13 +00:00
Remi NGUYEN VAN
f40f71ccf1 Replace isWeaklyValidatedHostname with guava 
The guava implementation is more accurate than the basic NetworkUtils
implementation.
NetworkUtils is being moved to its own JAR and will not be available
from Settings.

Bug: 174436414
Test: m
      Wrote test for isWeaklyValidatedHostname, verified it passes with
      guava
Change-Id: I1d01f2beba36009e17f651652e2d7f57be5aa398
 2020-12-08 14:02:17 +09:00
TreeHugger Robot
84d4237008 Merge "Fix advanced device icon won't update issue" 2020-12-08 02:29:37 +00:00
tim peng
cf4d295959 [automerger skipped] Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev am: de2f2754d9 am: 32ef316678 -s ours 
am skip reason: Change-Id Ibfc11e1bd99ba2e578b5d9e7dcc9132e372b68dd with SHA-1 1268629fda is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d9bf7bb9ad136975ec302c751cdf792311893f3
 2020-12-08 02:18:14 +00:00
tim peng
32ef316678 Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev am: de2f2754d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136219

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4c0ebb50dd2caaeabb1f39549a80d1de0890201
 2020-12-08 01:09:56 +00:00
tim peng
de2f2754d9 Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev 2020-12-08 00:55:21 +00:00
Xiao Ma
379cd8a008 Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev am: a63d8db293 am: b48fffc33b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13170053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I151c304b623cdb937eb4a208a3c72cf50440e9eb
 2020-12-08 00:52:31 +00:00
Xiao Ma
b48fffc33b Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev am: a63d8db293 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13170053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib822c372af03860a63533ec44638389fb25e2ffb
 2020-12-08 00:37:18 +00:00
Xiao Ma
a63d8db293 Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev 2020-12-08 00:15:53 +00:00
TreeHugger Robot
d3aec37f3a [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e am: 2aa9a43701 -s ours am: a9892de23f am: 85f6ce8e71 am: d6d4c2ac64 am: 7787e22dd3 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie16930e02e4035de7386f96704c7232317afee18
 2020-12-07 21:33:03 +00:00
Eugene Susla
d3e3a6c931 [automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05 am: c8d81959a2 -s ours am: bfee0284e1 am: a5da16b1d6 am: bbad7cee9c am: cd191477c8 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fd01ec8b19ba20712ef08de5c8d3af82a274489
 2020-12-07 21:32:58 +00:00
Eugene Susla
57109fabe4 [automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df -s ours am: 74ca730b4a -s ours am: 22864c728b am: 24ec36b6e8 -s ours am: 40961e80cd am: cf7f335294 am: edad8243b0 am: 39075b350e -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4775c57fedc48283efa881b53f9e6b0f6b4152a
 2020-12-07 21:29:24 +00:00
Eugene Susla
82f96447bb [automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138 -s ours am: 7bd20e27ab am: 90a1422f8c -s ours am: 5dcdc8c8f4 am: 03b269ea1d am: f0ecfe2cfc am: ff7de9afd8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9bfff26e054703d8409ffdb9b0f56460af89257b
 2020-12-07 21:11:36 +00:00
Xin Li
69cc5c5f5c [automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: 07ccb42665 am: 4a0b338a72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id80c3398d66311d0edc77e90ec6858951579ea1a
 2020-12-07 21:10:22 +00:00
TreeHugger Robot
7787e22dd3 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e am: 2aa9a43701 -s ours am: a9892de23f am: 85f6ce8e71 am: d6d4c2ac64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9675f55bc51baea068c6487f0a3fe7da7235aa6b
 2020-12-07 21:08:45 +00:00
Eugene Susla
cd191477c8 [automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05 am: c8d81959a2 -s ours am: bfee0284e1 am: a5da16b1d6 am: bbad7cee9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I153982db74a0316f1ac09bb2b6c72c1ac6bd282e
 2020-12-07 21:08:42 +00:00
Eugene Susla
39075b350e [automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df -s ours am: 74ca730b4a -s ours am: 22864c728b am: 24ec36b6e8 -s ours am: 40961e80cd am: cf7f335294 am: edad8243b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf07ef6acf26be8079fd48d4af4311c7b38f330a
 2020-12-07 21:08:33 +00:00
Eugene Susla
e5aa21505a [automerger skipped] RESTRICT AUTOMERGE am: bfa7a75545 am: d67e22c122 am: 31505ca0b3 am: 337aa8dbf3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0612610111fcc8200a095677398f80a59f8c968f
 2020-12-07 21:07:38 +00:00
Wesley.CW Wang
4212a5ef6c [automerger skipped] Add Battery Defender feature to Settings am: 7ccb54feb6 am: 974f359a26 -s ours 
am skip reason: Change-Id Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a with SHA-1 9a6aae5006 is in history

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

Change-Id: I3c7679781dede71b336f7784129425484a19985f
 2020-12-07 21:07:28 +00:00
TreeHugger Robot
a54f9ca3fd [automerger skipped] Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev am: 9ccf19cb9f am: cbbc224e4d -s ours 
am skip reason: Change-Id I2726a3deb397f646e4c74a8c445dde6fafb694a8 with SHA-1 3a7293cbbf is in history

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

Change-Id: Iae9edb41aed3f609cba43bb677baad53f38b3c53
 2020-12-07 21:07:14 +00:00
Xin Li
f471b344ec [automerger skipped] DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 835215964f am: c19e729570 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie076452445c1d73178c12cea269743276f48dcdf
 2020-12-07 20:56:11 +00:00
TreeHugger Robot
d6d4c2ac64 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e am: 2aa9a43701 -s ours am: a9892de23f am: 85f6ce8e71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17f588dc8bcd527b9f43492bc6437ac3d7dbff7f
 2020-12-07 20:54:43 +00:00
Eugene Susla
bbad7cee9c [automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05 am: c8d81959a2 -s ours am: bfee0284e1 am: a5da16b1d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69282d3c13d0bc4652beddc4823384a9817f148f
 2020-12-07 20:54:40 +00:00
Eugene Susla
edad8243b0 [automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df -s ours am: 74ca730b4a -s ours am: 22864c728b am: 24ec36b6e8 -s ours am: 40961e80cd am: cf7f335294 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac627656862cbf1348a29e7401c98e6fa74cba33
 2020-12-07 20:54:30 +00:00
TreeHugger Robot
0ddc1960f9 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e am: 2aa9a43701 -s ours am: a9892de23f am: b31cea60bf -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I982b0735f4a515253361e4601faedf4dc571a5f9
 2020-12-07 20:54:06 +00:00
Eugene Susla
8e5ad81a1a [automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05 am: c8d81959a2 -s ours am: bfee0284e1 am: 7177969533 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a013bb4f521b99f9401a18ff3a8b103f0c54215
 2020-12-07 20:54:04 +00:00
Eugene Susla
afaf245575 [automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df -s ours am: 74ca730b4a -s ours am: 22864c728b am: 24ec36b6e8 -s ours am: 40961e80cd am: 330028f0e0 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0471330b152d497cbe0ca5fbecabfd1b7a4d2183
 2020-12-07 20:53:52 +00:00
TreeHugger Robot
b31cea60bf [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e am: 2aa9a43701 -s ours am: a9892de23f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

Change-Id: Idcb1a917bc0388248671d7fcd155a5319ebf94cc
 2020-12-07 20:23:10 +00:00
Eugene Susla
7177969533 [automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05 am: c8d81959a2 -s ours am: bfee0284e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

Change-Id: I705f8bfdfecc8b9bf505a717074c02bf734b4af9
 2020-12-07 20:23:08 +00:00
Eugene Susla
330028f0e0 [automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df -s ours am: 74ca730b4a -s ours am: 22864c728b am: 24ec36b6e8 -s ours am: 40961e80cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751

Change-Id: I918e38d9e29f56581088a56770a2067345458199
 2020-12-07 20:23:01 +00:00
TreeHugger Robot
85f6ce8e71 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e am: 2aa9a43701 -s ours am: a9892de23f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65d77c3c623f4c4ee099e0814db1d30cda2af6dd
 2020-12-07 20:22:50 +00:00
Eugene Susla
a5da16b1d6 [automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05 am: c8d81959a2 -s ours am: bfee0284e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3914c813a2c1fb40afd9fa8704d103ce74a0a80
 2020-12-07 20:22:47 +00:00
Eugene Susla
cf7f335294 [automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df -s ours am: 74ca730b4a -s ours am: 22864c728b am: 24ec36b6e8 -s ours am: 40961e80cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66c2806838f41b9e5fd022fd126e65773ae125cd
 2020-12-07 20:22:32 +00:00
TreeHugger Robot
a9892de23f [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e am: 2aa9a43701 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a415856595ff465a67d7312d2d9c09a410e87af
 2020-12-07 20:02:48 +00:00
Eugene Susla
bfee0284e1 [automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05 am: c8d81959a2 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8bb775b57acd051c5ce9658cdb0faeac152890f
 2020-12-07 20:02:46 +00:00
Eugene Susla
40961e80cd [automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df -s ours am: 74ca730b4a -s ours am: 22864c728b am: 24ec36b6e8 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67d0a5b8803ed1480752f1bd82852ce4d5ad8e13
 2020-12-07 20:02:31 +00:00
TreeHugger Robot
2aa9a43701 Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

Change-Id: I5bd01274e4f00a8f7666a364323525faa60e3251
 2020-12-07 19:28:33 +00:00
Eugene Susla
c8d81959a2 RESTRICT AUTOMERGE am: 2e82aa5d05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

Change-Id: I850120ab85fa938ebce7115c778b833b5266594c
 2020-12-07 19:28:31 +00:00
Eugene Susla
24ec36b6e8 [automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df -s ours am: 74ca730b4a -s ours am: 22864c728b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751

Change-Id: I633b0e35a224055ca9f07de627322f48065a234e
 2020-12-07 19:28:24 +00:00