Bill Yi
dacad238ef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours am: d011dd118c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Id08f874bb4455c9e2e5095e4b05fea3edc5f8a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:57:29 +00:00
Bill Yi
8dc74f00d0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours am: 04e9e462bd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I1aafbd82ca2326fb372b4f36b92bf49570216288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:57:21 +00:00
Bill Yi
d011dd118c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I0a9c1bed2609d20aa8bc2fea4215ee911ef05e67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:31:55 +00:00
Bill Yi
04e9e462bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I2684be3a39e8650d8d8357d95b4d1b634baee46b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:31:46 +00:00
Bill Yi
9b8d62847e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Iacfaa7a89d11000f8e5218661d404cad0e435795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:28 +00:00
Bill Yi
c64165dc4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I08ee6f10b0daff666ef0100551f50405a59f3132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:17 +00:00
Chloris Kuo
ec46abccf7
Merge "Fix settings crash when enhanced notification shown in search results"
2022-08-12 23:00:21 +00:00
Automerger Merge Worker
0b29492eb7
Merge changes from topic "am-33955e9c70784617ba9185fd3fa3dfcc" into tm-qpr-dev-plus-aosp am: cd4e51939f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: Iaa640a893f0358967e54e6b894f6fafc5719e13c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:44:25 +00:00
TreeHugger Robot
53d15f8a41
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours am: f92894768f -s ours am: d0223cc521 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: Id52c29f0aaefd689ca15dc69180cb6c104903c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:43:57 +00:00
TreeHugger Robot
11a504728c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours am: f0361b3188 -s ours am: 59f982a6b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I6c0ab6a85b3067afe0cb39a62c8620c6182bf1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:39:48 +00:00
Bill Yi
844659dca5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours am: b530fcdd2f -s ours am: 0bb9bea783 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I6823a7293ce9043ca1fef4c415394ea980c3098b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:39:23 +00:00
Automerger Merge Worker
812521e7b6
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours" into tm-d1-dev-plus-aosp am: 4fec01b98a -s ours am: a72452db78 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I99a292d2eacf10e7e50b057325f0c846632a0c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:37:04 +00:00
Bill Yi
52758200cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours am: e001721f49 -s ours am: 877d23dded -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I473a9c5bc4d7bb129594cf007db27d4d2b5d4faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:36:41 +00:00
Automerger Merge Worker
235303126d
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours am: b3eb862b70 -s ours" into tm-qpr-dev-plus-aosp am: e36e9757ef -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: Ic02ebff2024d7e49680fab35c16536c58b325ad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:32:38 +00:00
Bill Yi
c9e791e6f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours am: b3eb862b70 -s ours am: 42dd80e568 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I97f01ded71e0763075c1bfa254319c711eb4941f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:32:10 +00:00
Bill Yi
47425b129a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours am: 76182fe42d -s ours am: c5569d9d42 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I224690fa259012ac119565b3e4d6183e10aa7703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:28:05 +00:00
Automerger Merge Worker
cd4e51939f
Merge changes from topic "am-33955e9c70784617ba9185fd3fa3dfcc" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70faf92894768f6e59b16b1a6b09835d1e
2022-08-12 20:18:59 +00:00
TreeHugger Robot
d0223cc521
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours am: f92894768f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: Ib84637b04cd657d064844de33db328b6fdf7f068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:17:45 +00:00
Bill Yi
563cb22c41
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours am: 6b09835d1e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: Icb75ad5b3cc5a7aaf7395f27b9f4e5801f57ee5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:17:24 +00:00
TreeHugger Robot
59f982a6b3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours am: f0361b3188 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I8e0cb90dc526eccdf738165ae9dfb6553bb41d1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:16:05 +00:00
Bill Yi
0bb9bea783
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours am: b530fcdd2f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I6c94529d3be751f99ad02f9bf568806f3c5d8f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:15:43 +00:00
Automerger Merge Worker
a72452db78
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours" into tm-d1-dev-plus-aosp am: 4fec01b98a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I04469b260b2588684c3390de9336ae8fe68f0e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:13:41 +00:00
Bill Yi
877d23dded
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours am: e001721f49 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: Ic4f09d13d2e31bdb1a980863cbce19504238fadc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:13:16 +00:00
TreeHugger Robot
f0361b3188
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I59064adc6cbf5ccd656e966f149943dd57798b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:35 +00:00
TreeHugger Robot
f92894768f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I98da540c0dc07551a1ecdf8c7bf7b87f16be53c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:30 +00:00
Automerger Merge Worker
e36e9757ef
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours am: b3eb862b70 -s ours" into tm-qpr-dev-plus-aosp
2022-08-12 20:10:25 +00:00
Bill Yi
b530fcdd2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I3c09e2d6b833257910a84819c7b08b8dac696dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:10 +00:00
Bill Yi
6b09835d1e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: Ib0c9054563ab03e9075de4b3c55bdd8fe02ddc71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:08 +00:00
Bill Yi
42dd80e568
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours am: b3eb862b70 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I9dc268cb3347ee8480f643a49044f21bb7d3a18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:09:20 +00:00
Bill Yi
c5569d9d42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours am: 76182fe42d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I77aeeafdb3edfef16a181dff0626fa6059ebd283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:08:44 +00:00
TreeHugger Robot
ba19ab70fa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-12 19:50:01 +00:00
Automerger Merge Worker
4fec01b98a
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours" into tm-d1-dev-plus-aosp
2022-08-12 19:43:18 +00:00
Bill Yi
b3eb862b70
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: a87c5a5641 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I340b51276529f1b25278b1fe728d1b9f96ac40ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:42:11 +00:00
Bill Yi
e001721f49
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I7b4e7ae5ba8cb265e33694cb3c4130019edfff60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:42:09 +00:00
Bill Yi
76182fe42d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 1d60978515 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I499779bbd3cca72249b731b4a0f9572d27bfa3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:42:06 +00:00
Bill Yi
a35159b7b6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours am: 2f0a902523 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: Ied69ab54352110e02220244059f473afe7b3d523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:41:48 +00:00
Bill Yi
1d60978515
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: Icd7bb1e1eb6caba9610276ed3660e919c2be94c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:06:24 +00:00
Bill Yi
2f0a902523
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: Ic13da209a020e3c6df75b2b4ca47b921932f8c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:05:57 +00:00
Bill Yi
a87c5a5641
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I4393f4ae54b277c694110ace08d1a6ce48acbec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:04:44 +00:00
Ats Jenk
c2fae645f0
Merge "Developer tile for toggling desktop mode" into tm-qpr-dev am: 3f000fa764 am: 7dad9f50a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18975659
Change-Id: I45d7ac7982ea7306ae2ed069920c201f3116ba54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 17:06:30 +00:00
Ats Jenk
7dad9f50a9
Merge "Developer tile for toggling desktop mode" into tm-qpr-dev am: 3f000fa764
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18975659
Change-Id: I11cc8ff6ad5b704ecb6c20f5b5975c7cb2cb14a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 16:40:24 +00:00
Ats Jenk
3f000fa764
Merge "Developer tile for toggling desktop mode" into tm-qpr-dev
2022-08-12 16:22:44 +00:00
TreeHugger Robot
a9954d066b
Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev am: cfd4e87ac8 am: 5cf9730c31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19604134
Change-Id: I64c11a0a7e9e03246a3bc05ea969eb889448ceff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 16:17:00 +00:00
TreeHugger Robot
5cf9730c31
Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev am: cfd4e87ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19604134
Change-Id: Iece6c6ec5fa09ff8fb5861175742c739b653f92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 15:49:19 +00:00
TreeHugger Robot
cfd4e87ac8
Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev
2022-08-12 15:05:49 +00:00
Bill Yi
9d4bf7b223
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f852ef2312fc59d8aa1cb46ee7b04c33ec2b13f
2022-08-12 07:30:07 -07:00
Bill Yi
0d14a19eee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3e12999c8049c46ebdc24abce1b01aa5bd90b103
2022-08-12 07:26:23 -07:00
Yanting Yang
ea6a06c8e8
Check DISALLOW_APPS_CONTROL before performing reset app preferences
...
When DISALLOW_APPS_CONTROL restriction is enabled, users should not be
able to enable/disable apps, clear app caches and clear app data.
The function of reset app preferences will re-enable the disabled apps,
it can let users bypass DISALLOW_APPS_CONTROL to enable an app disabled
by IT admin to see sensitive information.
To fix this vulnerability, we add a check for DISALLOW_APPS_CONTROL
restriction before users reset app preferences. Once the restriction is
enabled, it will show dialog “Blocked by your IT admin” instead.
Bug: 238745070
Test: Verify change by turning on/off DISALLOW_APPS_CONTROL with TestDPC.
Change-Id: Iffee73cf4952b686a78b4c7aaa54747971337d03
(cherry picked from commit 4356c9c653
2022-08-12 12:25:48 +00:00
TreeHugger Robot
fdccd0c4d9
[automerger skipped] Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev am: 5ab0a976de -s ours am: b88e71b1c0 -s ours
...
am skip reason: Merged-In I52547d10f0579fddb21091b641925910db17ef38 with SHA-1 91aec69fdchttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19603838
Change-Id: Ia37654ee538bd18f326ec2fa4cca71ab95c6d392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 10:55:00 +00:00
Zaiyue Xue
812a63e5c2
[automerger skipped] Fix import of anyLong in BatteryChartPreferenceControllerTest. am: 2e7957727f -s ours am: 0a71d08b7d -s ours
...
am skip reason: Merged-In I52547d10f0579fddb21091b641925910db17ef38 with SHA-1 91aec69fdchttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19603838
Change-Id: I2ca6ee5182d2492dc29aaa2d305e1f246492092f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 10:54:57 +00:00
