PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,041 Commits 1 Branch 0 Tags
8ebf4ac8f70f0806fc7515aee7d6667fe92c8249
Commit Graph

69041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
8ebf4ac8f7 [automerger skipped] Import translations. DO NOT MERGE am: 82322a6754 -s ours am: cbd2b6aa2a -s ours am: 3c015b8044 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib66cfd296f5d39f7ca257305d8090eff5f09fdf5
 2020-06-20 23:43:54 +00:00
Bill Yi
3c015b8044 [automerger skipped] Import translations. DO NOT MERGE am: 82322a6754 -s ours am: cbd2b6aa2a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11cfdab42baf34f427d952eec081fbe323a531c8
 2020-06-20 23:34:04 +00:00
Bill Yi
cbd2b6aa2a [automerger skipped] Import translations. DO NOT MERGE am: 82322a6754 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iedb69ba596e6095c9359455b585b2411fb8923b4
 2020-06-20 23:22:06 +00:00
Bill Yi
82322a6754 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ifd53c8670485825782f0c44452bfd33e56b721b2
 2020-06-20 22:06:36 +00:00
tim peng
253ee8c68a Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 34a29d1bb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I649c9f5a90d9ac2615e715b7a40e907faf40d495
 2020-06-20 11:02:27 +00:00
tim peng
5375d1e3b1 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: fc3f730d98 am: 23917b3826 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I0aa9b9a205445dd798245fc7b06a49c818287c4c
 2020-06-20 10:58:37 +00:00
tim peng
826cd4f88f Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 593d62d992 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: Ib28d00846fd3f92015248148e6ce83bd44e82c95
 2020-06-20 10:58:26 +00:00
tim peng
23917b3826 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: fc3f730d98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I73bbbb19f344da5e35a50190ef175e059f4e47dc
 2020-06-20 10:48:45 +00:00
tim peng
34a29d1bb5 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: I5424b492896803eb5e20ae2fcc636df7e7b5c6e5
 2020-06-20 10:48:45 +00:00
tim peng
593d62d992 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: Ibcab4ea712bcf00fa380c2f449713e6304e766b2
 2020-06-20 10:48:25 +00:00
TreeHugger Robot
98a03ef382 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 am: fb904dcfc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Ib7183b5ea5b46e6f04ea8e037bf414982bef9357
 2020-06-20 10:25:23 +00:00
tim peng
fc3f730d98 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: Iadc1abf749b34eb94956dd9e21a910d56069d4d4
 2020-06-20 10:25:18 +00:00
TreeHugger Robot
839750298a Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 128d19f24e am: ab95ad13fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Icc29fe3093baa653323b57c55ba06bf9b4d6a425
 2020-06-20 10:25:09 +00:00
tim peng
9ff43d2fa3 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663

Change-Id: Ida3ffa1110238057993e4ce345dce3cb3a8791d6
 2020-06-20 10:25:04 +00:00
TreeHugger Robot
d7dbafa800 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 am: 9c6d33b149 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: If6b5062dd334b53b3cb90f10dccd97b4a7ae7fa9
 2020-06-20 10:25:02 +00:00
TreeHugger Robot
fb904dcfc1 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: I5bcce3784d3192fab5dcbec2f13b8cf6e22694e8
 2020-06-20 10:12:26 +00:00
TreeHugger Robot
ab95ad13fb Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 128d19f24e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: I9296c9684b70222b8cabb39fd2c89093ca21d980
 2020-06-20 10:12:25 +00:00
tim peng
02e311e537 Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev 2020-06-20 10:12:03 +00:00
TreeHugger Robot
9c6d33b149 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: I570056028a1605984de1d0e657bc540a8d6fe045
 2020-06-20 10:12:02 +00:00
TreeHugger Robot
128d19f24e Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Icc40ad462d75fdd5d104681fac707b0562119dfc
 2020-06-20 09:57:19 +00:00
TreeHugger Robot
74bb0edf99 Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Ib482b91a0fc2b10d17150f212b2990ef753347a1
 2020-06-20 09:57:03 +00:00
TreeHugger Robot
cab1329f0f Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev 2020-06-20 09:42:23 +00:00
Jason Chiu
ad9a214fff Revert "Revert "Fix SecurityException while accessing Slice Uris"" 
This reverts commit 52ac47d9c8.

Reason for revert: This CL is what we wanted to merge in RVC and has already got Code-Review +2, Owner-Approval, and DrNo-Review from other folks regardless of the accident.

Bug: 159195420
Change-Id: I6c646269cd3e13e015dcc06418e21db66372e680
 2020-06-20 07:04:52 +00:00
Sunny Shao
aac6f22c8e [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours am: b345896d55 -s ours am: c325b11117 -s ours am: b1756d3c50 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I08fa60d5d540d4cff58dff4bea6602b42803241e
 2020-06-20 05:47:28 +00:00
Sunny Shao
1ad160b1df [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours am: b345896d55 -s ours am: ea8d70b9b1 -s ours am: 7bf05608b0 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I11abcb84ddb10e7df9579e035c6e664ed2753445
 2020-06-20 05:47:16 +00:00
Sunny Shao
40d3319974 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours am: b345896d55 -s ours am: c325b11117 -s ours am: 064fb53d3f -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: If338dadd0b609617d0d6213a7a5c6248f8fea76c
 2020-06-20 05:47:07 +00:00
Sunny Shao
b1756d3c50 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours am: b345896d55 -s ours am: c325b11117 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I950880fd50f253fa3ba4e24fc5a6fa56a1d49888
 2020-06-20 05:35:15 +00:00
Sunny Shao
7bf05608b0 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours am: b345896d55 -s ours am: ea8d70b9b1 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3 is in history

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

Change-Id: I22613bd66dcd88ddf7ddbf2ce2b3f7a5acbd25fc
 2020-06-20 05:35:11 +00:00
Sunny Shao
064fb53d3f [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours am: b345896d55 -s ours am: c325b11117 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I6f05f88204e0de2fdebf5a94d1333bcc0b41709f
 2020-06-20 05:34:53 +00:00
Sunny Shao
ea8d70b9b1 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours am: b345896d55 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I299271b7dd23771e023ec0774caef49df5d89bf2
 2020-06-20 05:21:11 +00:00
Sunny Shao
c325b11117 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours am: b345896d55 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I5deef4dc950efeb61a7e669c50b6cc37b7c7663c
 2020-06-20 05:20:52 +00:00
Sunny Shao
b345896d55 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours am: 2a2639f193 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I1746a3d5fc38f521bf421d3a986f01f0c369ae7b
 2020-06-20 05:08:14 +00:00
TreeHugger Robot
d157126eb8 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 914f8e7d07 am: f8c4277924 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: Ic10f29af66200bb89371fdfb575c4d39294a9ea5
 2020-06-20 05:02:30 +00:00
Sunny Shao
b6503ecd60 [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: e4e335c662 -s ours am: b9d8eebcdb -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I8ce6b1685e62e8f8f49eb0c980d7274e1468a7c5
 2020-06-20 05:02:25 +00:00
TreeHugger Robot
be1215c864 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f am: 58c4a5bf48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I49201c827abd6ca288a2d360873d17d4420148c6
 2020-06-20 05:02:18 +00:00
Sunny Shao
0293bd3222 [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: a3c637e61b -s ours am: 0d8086c16c -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I64968076496262183764f213193035fd2636e2c1
 2020-06-20 05:02:06 +00:00
Mark Chien
22fef7d38b [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 92eb12c0e2 am: cbfe64ea94 -s ours am: 0614f6da80 -s ours am: 2a77178e63 -s ours 
am skip reason: Change-Id I3b0da2672246997aee16b11576ce5ae9bfe596dc with SHA-1 efb029c067 is in history

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

Change-Id: I9fffe44f3caa9c0e8a8c26d5f68bbad812337544
 2020-06-20 04:58:46 +00:00
markchien
e70ac94408 [automerger skipped] Get entitlement configuration from intent extra am: 6d2c010891 am: 017dd38916 -s ours am: f5dc453a8b -s ours am: 5497e1a929 -s ours 
am skip reason: Change-Id I3d06df01302a9c1f0893712d9250fe394dc66588 with SHA-1 e22bd7a2e8 is in history

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

Change-Id: If09c2e2108fa76a53bd870f09fbf7164fa31ec9d
 2020-06-20 04:58:44 +00:00
markchien
eb0febd059 [automerger skipped] Remove isProvisioningNeededButUnavailable usage am: e48a3d7a76 am: 1932ef4389 -s ours am: c0d484c488 -s ours am: 1abe88eb28 -s ours 
am skip reason: Change-Id If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c with SHA-1 92b09e825f is in history

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

Change-Id: I37c98ba13f3bb842a4e2e3b70d3fd4e0d29af5b3
 2020-06-20 04:58:41 +00:00
Sunny Shao
2bc77c01e6 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: fab0388dc5 -s ours am: a2264d9a09 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: Ie739d5c2356a4640a90216fb057c949b7175d8cd
 2020-06-20 04:58:17 +00:00
Sunny Shao
2e978b2d0f [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: 6b54959afe -s ours am: 426b2576a2 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: Ia1df4eb334da9bf84674eb13e8d7ee2b0a0aece1
 2020-06-20 04:58:10 +00:00
TreeHugger Robot
33e5429474 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f am: d9d63ebea6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: I24a7976f0928ddf8fb4755a57b6659393164f91b
 2020-06-20 04:57:22 +00:00
Sunny Shao
b97e04f8da [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: a3c637e61b -s ours am: 73e27b249f -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

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

Change-Id: I76463a2ff1c75bc868f4cea49b4a27b0e7874f46
 2020-06-20 04:57:01 +00:00
Sunny Shao
d6812eb371 [automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9 -s ours am: cd328fdf28 -s ours am: 6b54959afe -s ours am: 0322929036 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844 is in history

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

Change-Id: I32af44f0f73e927fb198b55fd1677a47c0440da8
 2020-06-20 04:56:53 +00:00
TreeHugger Robot
d9d63ebea6 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: If2bece909901622ae43762ed24f1fc2853d278ba
 2020-06-20 04:56:52 +00:00
TreeHugger Robot
f8c4277924 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 914f8e7d07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: Ia3b9d654d0d62e10daec80c1b5e05b9739f62272
 2020-06-20 04:56:51 +00:00
Sunny Shao
73e27b249f [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: a3c637e61b -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

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

Change-Id: I27a04f69e54108cc16b472b096ba135221099950
 2020-06-20 04:56:46 +00:00
Sunny Shao
b9d8eebcdb [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours am: af9bdcb4b5 -s ours am: 0f995b348c -s ours am: e4e335c662 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I646cae8a5c2b5530803e018bde6b628124b3d299
 2020-06-20 04:56:44 +00:00
TreeHugger Robot
58c4a5bf48 Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541

Change-Id: Ia862cf87cf256805fb0b6ab27101cdfc41614778
 2020-06-20 04:56:28 +00:00
Sunny Shao
2a2639f193 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

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

Change-Id: I8dc9137ebe410ae8b4484c2fe489a9e7caa6ac59
 2020-06-20 04:56:22 +00:00