Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,998 Commits 1 Branch 0 Tags
c6eaed5ea2bae3342ec27ac3578e5eca71ae7215
Commit Graph

74998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c6eaed5ea2 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: 1c64519a1b -s ours am: 83244c0722 -s ours am: 5917f239f6 -s ours am: ab5ba2ac03 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I20a0a9d8e66d17248a85312a00a60a93a94378bf
 2020-07-31 01:48:37 +00:00
TreeHugger Robot
cdb387c879 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: f3f682446d -s ours am: 08d93061f5 -s ours am: ecb9abf8fc -s ours am: 1229c54068 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: I81205ce4d6c80e82ef634ce31dc0e9a80dc6d7c5
 2020-07-31 01:45:32 +00:00
TreeHugger Robot
acae9cd7fc [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours am: a23d9273aa -s ours am: 75dcf24143 -s ours am: 9d92db27a5 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: Ib3dec45cf0f968ce72856aa1fc251c17e01f44f3
 2020-07-31 01:41:49 +00:00
Arc Wang
d37f61c555 Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" am: b42d09f885 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12068762

Change-Id: I0797ae43ee48a6baa588c7bcb1f8f85608162451
 2020-07-31 01:30:33 +00:00
Blake Kragten
1836c8d970 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 23dd1699e2 am: 341c3c387e am: 88e4363384 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: Ic54bd3b2588f9be57ff134e61a4e2637b2b1885a
 2020-07-31 01:25:21 +00:00
TreeHugger Robot
ab5ba2ac03 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: 1c64519a1b -s ours am: 83244c0722 -s ours am: 5917f239f6 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I116e5ee8ade5e2ff428d35b362baa511aea9b76d
 2020-07-31 01:14:06 +00:00
TreeHugger Robot
1229c54068 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: f3f682446d -s ours am: 08d93061f5 -s ours am: ecb9abf8fc -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: Id3d1b2e5f09b3cbd159e84a8fcde43f4111a4707
 2020-07-31 01:09:55 +00:00
TreeHugger Robot
9d92db27a5 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours am: a23d9273aa -s ours am: 75dcf24143 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: Ibf30f8281fe967d6cd5b5aac05f2a931e7276394
 2020-07-31 01:04:48 +00:00
Arc Wang
b42d09f885 Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" 2020-07-31 00:58:01 +00:00
Blake Kragten
88e4363384 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 23dd1699e2 am: 341c3c387e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: I086dd980328616f11810bb057b794287354ad871
 2020-07-31 00:56:55 +00:00
TreeHugger Robot
5917f239f6 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: 1c64519a1b -s ours am: 83244c0722 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: Ic762608134d4473703242b7d29dbb09c86848f25
 2020-07-31 00:42:45 +00:00
TreeHugger Robot
ecb9abf8fc [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: f3f682446d -s ours am: 08d93061f5 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: I60806e41ed6ae61fbe309c9bae35d98b1a2058ec
 2020-07-31 00:39:52 +00:00
TreeHugger Robot
83244c0722 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: 1c64519a1b -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I8fdef7ebb5cac7da7a8d7a3a0f0a1e0a6f865c25
 2020-07-31 00:34:02 +00:00
TreeHugger Robot
75dcf24143 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours am: a23d9273aa -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: I317ef8481c694c6df0911af409b77a6119194333
 2020-07-31 00:27:20 +00:00
Blake Kragten
341c3c387e Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 23dd1699e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: Ied32e650b82e0725329d7fa55c18073ce4b4cc91
 2020-07-31 00:16:59 +00:00
TreeHugger Robot
1c64519a1b [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I06bcb94af10cea2a23eceb8d745851e87ca8506c
 2020-07-31 00:12:02 +00:00
TreeHugger Robot
8b7cdc3fb3 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I279748876b2b41eb3755af32b70dd0c508b536fe
 2020-07-30 23:53:38 +00:00
TreeHugger Robot
49729c59d9 Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev 2020-07-30 23:37:28 +00:00
TreeHugger Robot
a81fec7bb5 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours am: d6f6c8da11 -s ours am: 0d82f65875 -s ours am: bbd7642c59 -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/+/11802013

Change-Id: I2f5a3db02e9cf63f956035846ef32504f422dcf5
 2020-07-30 18:16:19 +00:00
TreeHugger Robot
bbd7642c59 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours am: d6f6c8da11 -s ours am: 0d82f65875 -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/+/11802013

Change-Id: I029eee6fa9c17ce697afcca041532abbf2ae23bd
 2020-07-30 18:08:03 +00:00
TreeHugger Robot
5647233b72 Merge "Change battery saver text." am: 644d7f5b30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12272177

Change-Id: I726ca51c562e62d6e26080fd2c9c310cddf105b3
 2020-07-30 18:07:19 +00:00
TreeHugger Robot
644d7f5b30 Merge "Change battery saver text." 2020-07-30 17:49:42 +00:00
TreeHugger Robot
0d82f65875 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours am: d6f6c8da11 -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/+/11802013

Change-Id: Ia5a4353c5437338f539c61c2341bcdff3359dcbb
 2020-07-30 17:48:26 +00:00
TreeHugger Robot
08d93061f5 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: f3f682446d -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: I726bb91508cef24f5ffc0ba598eb541c6a74aefc
 2020-07-30 17:30:15 +00:00
TreeHugger Robot
d6f6c8da11 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -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/+/11802013

Change-Id: Ia57744d17a4c1fa1cdf092ce5e1777acc772b922
 2020-07-30 17:30:02 +00:00
TreeHugger Robot
a23d9273aa [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -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/+/11802013

Change-Id: Ia15c8c835df5ae2934b21b9a7ceff856de349cef
 2020-07-30 17:28:47 +00:00
TreeHugger Robot
f3f682446d [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -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/+/11802013

Change-Id: Id9d192f0b0112a75a352bfd0a910ee1cbb88be27
 2020-07-30 17:12:15 +00:00
TreeHugger Robot
9a4e24e12e [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -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/+/11802013

Change-Id: Icfb4a5ba3aa6c8086788d166ded8e871c5c8efaf
 2020-07-30 17:12:01 +00:00
TreeHugger Robot
c5cc1c5939 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -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/+/11802013

Change-Id: Ic782d5e5a5e1943394e735b6e8ca39a3436e9a88
 2020-07-30 16:52:18 +00:00
Kweku Adams
8e408638c9 Change battery saver text. 
Make it a little clearer that the device has to charge above a certain
level before BS will turn off, instead of just *being* above a certain
level.

Bug: 158293108
Test: N/A
Change-Id: I532d1fee8f637d95335c251e59d45a5b7860b412
 2020-07-30 09:41:41 -07:00
TreeHugger Robot
2076a10386 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -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/+/11802013

Change-Id: I1cfca1524b3a01f509de2d39a28f1139ded1c5dc
 2020-07-30 16:31:55 +00:00
TreeHugger Robot
b3448be7c7 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -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/+/11802013

Change-Id: I617235e4c0ed84c85737980bbc77af18fbf3105a
 2020-07-30 16:13:58 +00:00
TreeHugger Robot
d3ab16f1e2 Merge "Allows to launch only authenticator owned activities" into pi-dev 2020-07-30 15:53:33 +00:00
Matthew Mintz
6e3bbccf2d Merge "Make WallpaperPreferenceController available when only style picker present." am: 827665a4a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248956

Change-Id: Idc1b7445e7906e75ccd0f03017f683caaafd5288
 2020-07-30 07:05:26 +00:00
Edgar Wang
ba4333e5d0 Merge "Update language to comply with Android's inclusive language guidance" am: 8a3e7d77a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248948

Change-Id: I146e113f071a96ad385a5d66ee48ae2bea777274
 2020-07-30 07:04:22 +00:00
Blake Kragten
3a7181d8f4 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 9efa2b85f0 am: aea24e652a am: f0cd62cf8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: I821fcf2f36530762ffc823c38f2a430bc45acd0f
 2020-07-30 07:03:33 +00:00
Matthew Mintz
827665a4a4 Merge "Make WallpaperPreferenceController available when only style picker present." 2020-07-30 05:32:55 +00:00
Edgar Wang
8a3e7d77a0 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-30 02:17:48 +00:00
Blake Kragten
f0cd62cf8d Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 9efa2b85f0 am: aea24e652a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: I6c2ec7ab13e11648cf2bfad4866e978eaafd5b8d
 2020-07-30 00:06:55 +00:00
Blake Kragten
aea24e652a Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa am: 9efa2b85f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: Ib24274b8006238992cbaea5701e799a392b2edc3
 2020-07-29 23:45:51 +00:00
Blake Kragten
9efa2b85f0 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: I00117ec751f2e097e11dca61c9bb25e37e6b3016
 2020-07-29 23:27:51 +00:00
Blake Kragten
23dd1699e2 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172090

Change-Id: I394df7a8da5c74ae0937d04e60e1a7acc9c62791
 2020-07-29 23:26:26 +00:00
Blake Kragten
4a142045aa Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev 2020-07-29 23:04:17 +00:00
Amy Hsu
eff9693442 [automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47 am: 8fdbf9c60e -s ours am: 45e4334a8a -s ours am: 16c9b12b9b -s ours 
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 e81c695a47 is in history

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

Change-Id: I90a671c2277704b48a2d1f53b30bd5577ab5a553
 2020-07-29 09:42:05 +00:00
Amy Hsu
046fecd5c9 [automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47 am: df5b523ead am: 3d3da5a356 -s ours am: 64ee74c444 -s ours 
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 d3835522a4 is in history

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

Change-Id: Iee7b2753a41e3745bafa33676befdb8f35f4f595
 2020-07-29 09:41:59 +00:00
Treehugger Robot
59d1dc35f8 Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 am: 4d421a47dc am: 7b10a29318 am: 9b63618b47 am: 0c65a47568 am: 726531266c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I6d1292fad499b74c649f4b3224b2750b834cc9e4
 2020-07-29 09:41:51 +00:00
Matthew Mintz
3243920695 Make WallpaperPreferenceController available when only style picker present. 
WallpaperPreferenceController prefers the style picker over the basic wallpaper picker. However, the entire setting is disabled when only the style picker is available, even though the basic wallpaper picker is not used. This change corrects that.

Fixes: 162395248
Test: Added unit tests. Also built, flashed and tested setting with all four combinations of CategoryPickerActivity and CustomizationPickerActivity enabled/disabled.
Change-Id: I4184f834ed771359cef13b64aacf2072e592d6d8
 2020-07-29 17:39:47 +08:00
Amy Hsu
16c9b12b9b [automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47 am: 8fdbf9c60e -s ours am: 45e4334a8a -s ours 
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 e81c695a47 is in history

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

Change-Id: I43463c2e0e965d3aef8d165471fa5f93410f8e08
 2020-07-29 09:31:51 +00:00
Amy Hsu
45e4334a8a [automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47 am: 8fdbf9c60e -s ours 
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 e81c695a47 is in history

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

Change-Id: Ic7fb82dfd760c4133a555198551163a38c4740f3
 2020-07-29 09:27:09 +00:00
Amy Hsu
64ee74c444 [automerger skipped] Change the UI strings of developer in Settings app am: e81c695a47 am: df5b523ead am: 3d3da5a356 -s ours 
am skip reason: Change-Id I79a9b955aae70da5e19f93504b39b2191a151c8f with SHA-1 d3835522a4 is in history

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

Change-Id: If1f4d5a73a7909cc95de784b72c763fdd705f0fc
 2020-07-29 09:25:03 +00:00