Commit Graph

71217 Commits

Author SHA1 Message Date
TreeHugger Robot
3257a4448c Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11 am: 0d6dcbb507 am: 56001a89de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I17314de42a730b2c902abf2a9791b8c5bdcee3e0
2020-06-03 18:15:57 +00:00
Will Brockman
55db3402b8 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 5d859ea300 am: 58af569f66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I8b5b547cce6f804d062e9518e2a0b9712cdf071a
2020-06-03 18:13:58 +00:00
Will Brockman
a52b40c170 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 5d859ea300
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I0f9c8ac84872b7e88c860e3033b1aac81d7a127e
2020-06-03 18:01:01 +00:00
Will Brockman
63bb9a404f Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 815dac6ce0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I413de4bd9af640533e9be5e57af1ff00af2237b8
2020-06-03 18:00:11 +00:00
Will Brockman
58af569f66 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 5d859ea300
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I378c3f2dc0a42ab38332c16a29542a3691636670
2020-06-03 17:59:46 +00:00
Will Brockman
815dac6ce0 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I6ad5bfd54a1a0d52f6207c103adc5808f60365f8
2020-06-03 17:58:37 +00:00
Will Brockman
5d859ea300 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I93a6ace5ceab0cf0b0794c8a241e99d301f07cb1
2020-06-03 17:58:02 +00:00
TreeHugger Robot
6901b26c20 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 455227793c am: 9f9631b7ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I8da7eded5d541ac9ed9422e99902985f5fdadd46
2020-06-03 17:57:55 +00:00
TreeHugger Robot
2b3f033d5e Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11 am: cc0f307449
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I384e3f406fc07e1683b5302e56cacb0829e9e92f
2020-06-03 17:56:35 +00:00
TreeHugger Robot
56001a89de Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11 am: 0d6dcbb507
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I06ba7876590b6ec81d8f19f269df3bdce7fcf177
2020-06-03 17:56:19 +00:00
Will Brockman
5c1b9c357d Merge "Statsd UiEvent logging for notification history." into rvc-dev 2020-06-03 17:55:47 +00:00
Xin Li
729c213fb7 Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: I614914b738e3af198fe21b881d2e475e2e8eda41
Change-Id: Idd585020a1fed163866339c09d614dca0ca6e55f
2020-06-03 10:45:09 -07:00
TreeHugger Robot
9f9631b7ce Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 455227793c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: Idbda613b47fd4ba3e81e45ddb0fc50a77630e78d
2020-06-03 17:37:09 +00:00
TreeHugger Robot
0d6dcbb507 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I6d504aab02bfd00ad3943d4b1ea82fc32feab92e
2020-06-03 17:36:41 +00:00
TreeHugger Robot
cc0f307449 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I541a0150eff40fb07ef8263e8c510f869a9306cb
2020-06-03 17:36:41 +00:00
TreeHugger Robot
455227793c Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: Iae49b6d19752166dd0e1c2ba478625bc40b7aa1f
2020-06-03 17:23:14 +00:00
TreeHugger Robot
221f9b4c11 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: Ic2e1d889afacc4948360d04cef90188c600fd9c1
2020-06-03 17:23:08 +00:00
TreeHugger Robot
4bb32b6c58 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev 2020-06-03 17:11:45 +00:00
TreeHugger Robot
090988f05c Merge "Import translations. DO NOT MERGE" 2020-06-03 15:49:49 +00:00
TreeHugger Robot
b0c04f161b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb -s ours am: f8c3f387e0 -s ours am: c1f864d0d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1495b5973f2a3afb195da876c1e11c22266e021
2020-06-03 15:27:30 +00:00
TreeHugger Robot
ca6fc9a894 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: b57c537dde -s ours am: f900d3a3ac -s ours am: 9ef01930d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad111241a9c573598992c8b8c48de4451a013e65
2020-06-03 15:27:07 +00:00
TreeHugger Robot
357967b10e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593 -s ours am: b200003ca0 -s ours am: 63708efa4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic33ab5a7ac6827bf1e6c71220da669af3156c130
2020-06-03 15:25:09 +00:00
Automerger Merge Worker
2a3d5fb52b Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: 83d07425f4 -s ours" into rvc-d1-dev-plus-aosp am: a1ce22e1e0 -s ours am: 6f15ea7182 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib18fee053f5fc1e4e9d16d8cee54b2ffec4158b4
2020-06-03 15:25:03 +00:00
TreeHugger Robot
c521747613 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb -s ours am: 6fa00750af -s ours am: 2c01363040 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99a13a962c4a88f7389b926166c804030fe38a2a
2020-06-03 15:24:20 +00:00
TreeHugger Robot
c3185dc8a9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: b57c537dde -s ours am: 14d5d07f76 -s ours am: 07671c3406 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I304fd1fed1211231f1e1b7df100c17ac940f60f1
2020-06-03 15:23:41 +00:00
TreeHugger Robot
5e0e69cb05 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593 -s ours am: 36da31b9e4 -s ours am: 50e08cdbbe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I552c62c4782f4d953eec91370a6769891b0a4d57
2020-06-03 15:23:03 +00:00
TreeHugger Robot
c1f864d0d6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb -s ours am: f8c3f387e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I948370b6f54f36577ac9337752986f1c7c0200db
2020-06-03 15:10:37 +00:00
TreeHugger Robot
9ef01930d1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: b57c537dde -s ours am: f900d3a3ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib671492fd5d11586a5ac94f32d6ced85d5a3ec53
2020-06-03 15:10:20 +00:00
TreeHugger Robot
63708efa4c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593 -s ours am: b200003ca0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3bd46968c6c730ec99583283a8354534c6b24ffb
2020-06-03 15:10:13 +00:00
Automerger Merge Worker
6f15ea7182 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: 83d07425f4 -s ours" into rvc-d1-dev-plus-aosp am: a1ce22e1e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f8de6f691b9838aaeadc8c7c97a5e81a3eafbe7
2020-06-03 15:10:05 +00:00
TreeHugger Robot
2c01363040 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb -s ours am: 6fa00750af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77b115cc4983fe8d5d5e1f5fb63dc89d170498df
2020-06-03 15:09:58 +00:00
TreeHugger Robot
07671c3406 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: b57c537dde -s ours am: 14d5d07f76 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I487894a2cc96f2cf53ac0f839b6cd544f1fda3ba
2020-06-03 15:09:42 +00:00
TreeHugger Robot
50e08cdbbe [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593 -s ours am: 36da31b9e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0bff72d1079e188f2332e75b8c1a1268ec7ae85f
2020-06-03 15:09:13 +00:00
TreeHugger Robot
04093cae35 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: 3998e37c08 -s ours am: 7741b83a5a -s ours am: 0763edb609 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b6d97663b88fdcca392de6fd6156a853265eb19
2020-06-03 15:04:08 +00:00
TreeHugger Robot
335aec019d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: ffaf35fed3 -s ours am: 8a25126839 -s ours am: 02ce7200ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I01c07f1294ae863de5409ef907d3b09789d20669
2020-06-03 15:03:55 +00:00
TreeHugger Robot
943fabf7aa [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: 3998e37c08 -s ours am: 28887ff65a -s ours am: 3f9a6f3e0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b5ccd3118e3598149f66b2da90d675d27a2eb01
2020-06-03 15:03:41 +00:00
TreeHugger Robot
f8c3f387e0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe2ccc7d0e2cb809c7957dbbc0eba471defa73d1
2020-06-03 14:58:50 +00:00
TreeHugger Robot
f900d3a3ac [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: b57c537dde -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e11f0fbbf0af286cde22f8ec1da3d5093f46460
2020-06-03 14:58:44 +00:00
Automerger Merge Worker
a1ce22e1e0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: 83d07425f4 -s ours" into rvc-d1-dev-plus-aosp 2020-06-03 14:58:31 +00:00
TreeHugger Robot
014b1dc5c0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: 83d07425f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8301abffa4aa6c932187d2b99859d1afc8548d5
2020-06-03 14:58:27 +00:00
TreeHugger Robot
b200003ca0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idc8c41f255c30c255a3f38c5cb24ea2eb7555809
2020-06-03 14:58:24 +00:00
TreeHugger Robot
6fa00750af [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcc36cc463d959e850ec09e790799750042fa988
2020-06-03 14:58:23 +00:00
TreeHugger Robot
14d5d07f76 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: b57c537dde -s ours
am skip reason: subject contains skip directive

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

Change-Id: I422f46004a638318ead120466b91150a11fde0e1
2020-06-03 14:58:17 +00:00
TreeHugger Robot
36da31b9e4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ab0716d3d9008326846d8afdbcc1365553a6040
2020-06-03 14:57:57 +00:00
TreeHugger Robot
d1620abcfb Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-03 14:54:04 +00:00
TreeHugger Robot
0763edb609 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: 3998e37c08 -s ours am: 7741b83a5a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I578b1d595d0e35758d2a9435aa60f3eb51d234bc
2020-06-03 14:51:11 +00:00
TreeHugger Robot
02ce7200ca [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: ffaf35fed3 -s ours am: 8a25126839 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2486511e674c8bff5e3c0dfd3db4a2b143116558
2020-06-03 14:50:48 +00:00
TreeHugger Robot
3f9a6f3e0f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: 3998e37c08 -s ours am: 28887ff65a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie86e0b52f51d667da41397de5b990a4e49453337
2020-06-03 14:50:35 +00:00
Kholoud Mohamed
04b2ab2065 Add cross profile apps entry in the privacy screen
Test: manual testing
Bug: 146318770
Change-Id: Id30a2f4cf40cc5c83e4d4d2544ac6696366fc44a
2020-06-03 15:46:35 +01:00
TreeHugger Robot
83d07425f4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47c198c73d09f9a46da6fa360a467e5cd65d3a90
2020-06-03 14:44:59 +00:00