Commit Graph

70645 Commits

Author SHA1 Message Date
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
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
TreeHugger Robot
b57c537dde [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: Icbfe834b63424afd43db3251c03268484799243f
2020-06-03 14:44:21 +00:00
TreeHugger Robot
ba824d0593 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-03 14:43:44 +00:00
TreeHugger Robot
8a25126839 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: ffaf35fed3 -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: I4833a399c940c6bb961f5ff6011f07b3840b5c34
2020-06-03 14:39:52 +00:00
TreeHugger Robot
7741b83a5a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: 3998e37c08 -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: Icbadd31c79dbd9109ec14c53c6a88aeeb1e960a8
2020-06-03 14:39:21 +00:00
TreeHugger Robot
28887ff65a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -s ours am: 3998e37c08 -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: Id513baadb02e0a734800a8d3c19cbaab90d8771b
2020-06-03 14:39:20 +00:00
TreeHugger Robot
3be2b58394 Merge "Import translations. DO NOT MERGE" 2020-06-03 14:36:34 +00:00
TreeHugger Robot
82b99f14a2 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-03 14:34:25 +00:00
TreeHugger Robot
ffaf35fed3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -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: Iebea25bf71d692e404fdb3358d3fd4b76eafd58d
2020-06-03 14:17:32 +00:00
TreeHugger Robot
3998e37c08 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 879fba597f -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: I0f23e3a5bef0c7f719522c22eb2720380d64635d
2020-06-03 14:17:18 +00:00
TreeHugger Robot
879fba597f Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-03 14:07:12 +00:00
Automerger Merge Worker
5c9bd9536e Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de" into rvc-d1-dev-plus-aosp am: dca875c0fb am: c951ec1a65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: Ia9516891bda9cd39a8c214e5c3529683d9a90676
2020-06-03 12:19:01 +00:00
Automerger Merge Worker
321a0b2c66 Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 09052ac8d9" into rvc-qpr-dev-plus-aosp am: a3cfe0e8bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: I57de0a0d74537e6975b7802cd66a3d33920a6d7d
2020-06-03 12:17:00 +00:00
Julia Reynolds
79d8a6c449 Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 9d22d9582b am: 6cb3469fb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: I6e73f7e7f6e8a91d69f9aac14ba3b7b6af6c19b0
2020-06-03 12:15:59 +00:00
Automerger Merge Worker
c951ec1a65 Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de" into rvc-d1-dev-plus-aosp am: dca875c0fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: Ia8782acb30732df62780c4b8ea1b593ae80631ed
2020-06-03 12:05:38 +00:00
Automerger Merge Worker
a3cfe0e8bb Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 09052ac8d9" into rvc-qpr-dev-plus-aosp 2020-06-03 12:03:55 +00:00
Julia Reynolds
6cb3469fb2 Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 9d22d9582b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: Id635116c1a8bbda65bfab34c34e36366162e8ce2
2020-06-03 12:03:45 +00:00
Julia Reynolds
25e0bc3aa0 Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 09052ac8d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: I03ebf0cbc6688f6a3c02ca274277cbc171bf4d5b
2020-06-03 12:03:45 +00:00
Automerger Merge Worker
dca875c0fb Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de" into rvc-d1-dev-plus-aosp 2020-06-03 11:49:57 +00:00
Julia Reynolds
09052ac8d9 Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: I0a9776f57778db6ad94e77457033d15ff3415dd1
2020-06-03 11:49:47 +00:00