TreeHugger Robot
0123fcdcd3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee
-s ours am: d9a0046fd6
-s ours am: 99d4f7fb02
-s ours am: e124d8caa3
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I54f7091ddd74fec21395d51f5152b5b0db5f36b2
2020-04-01 06:15:44 +00:00
TreeHugger Robot
37417cc4f8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee
-s ours am: 80036cffa9
-s ours am: f444344c5d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I7e4c736329e67a4d44e759946b47f9870f2516a2
2020-04-01 05:57:20 +00:00
TreeHugger Robot
e124d8caa3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee
-s ours am: d9a0046fd6
-s ours am: 99d4f7fb02
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Icce74295aba2d2fa30c978c8b9df11c42b73ef64
2020-04-01 05:57:15 +00:00
TreeHugger Robot
2815ffd722
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee
-s ours am: d9a0046fd6
-s ours am: 93d950aa04
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iea49ae5df51369ef274cf9dd690656167cc540c0
2020-04-01 05:57:05 +00:00
TreeHugger Robot
99d4f7fb02
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee
-s ours am: d9a0046fd6
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib60a65ab9435d37fafbd92a6c4504202e8d4b066
2020-04-01 05:44:37 +00:00
TreeHugger Robot
f444344c5d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee
-s ours am: 80036cffa9
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I12e9cdb4c20c5e5b6519a14553af0397ed60d11c
2020-04-01 05:44:28 +00:00
TreeHugger Robot
93d950aa04
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee
-s ours am: d9a0046fd6
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iea664fae56e6e1822567ec0c7564b9c1f826b2bc
2020-04-01 05:44:10 +00:00
TreeHugger Robot
80036cffa9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I195e28633ce35791208174a7b3d61eb83dadbcdb
2020-04-01 05:32:13 +00:00
TreeHugger Robot
d9a0046fd6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Id41bbf1c7274c0475b5ed29577a88c17559ca9fa
2020-04-01 05:31:47 +00:00
TreeHugger Robot
58cadcc6ee
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-01 05:13:22 +00:00
Goven Liu
0bda2083c6
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
am: 15ff53ecfb
am: ea63069e93
am: 05dd6664e2
...
Change-Id: Ie4e7e1b205ca3dce9b05af7fd8058b67756a6b03
2020-04-01 04:15:34 +00:00
Automerger Merge Worker
286db1ad12
Merge "Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
am: 336834b17e" into rvc-d1-dev-plus-aosp am: 0295e02499
...
Change-Id: Iabf6d8ca41146b92fe1b488fcfa71b5115248bf4
2020-04-01 04:01:14 +00:00
Goven Liu
dbc337b4c5
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
am: 15ff53ecfb
am: 4b67490445
...
Change-Id: I035849dc12342937d00c55aa727116bc626322ab
2020-04-01 04:00:58 +00:00
Goven Liu
05dd6664e2
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
am: 15ff53ecfb
am: ea63069e93
...
Change-Id: I7ba160b65ec57f33f0c30afc88e34e9f2a74f8d1
2020-04-01 04:00:56 +00:00
Automerger Merge Worker
0295e02499
Merge "Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
am: 336834b17e" into rvc-d1-dev-plus-aosp
2020-04-01 03:49:43 +00:00
Goven Liu
4b67490445
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
am: 15ff53ecfb
...
Change-Id: I4409afa7c65bbf7d6d5ac051b8ebd7e258bedf91
2020-04-01 03:49:40 +00:00
Goven Liu
d0bc27f31e
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
am: 336834b17e
...
Change-Id: Id059dbb0a8fc61d225f2efff917cba62dd3822d3
2020-04-01 03:49:40 +00:00
Goven Liu
ea63069e93
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
am: 15ff53ecfb
...
Change-Id: I9c8ede2f1ddf8e3f763caf0d68f2a7a586db20ab
2020-04-01 03:49:28 +00:00
Goven Liu
336834b17e
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
...
Change-Id: I4d369739d3d83771f220cacb1846338056367969
2020-04-01 03:36:29 +00:00
Goven Liu
15ff53ecfb
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
...
Change-Id: I681ff5a91c45eca3d6f80dc61aed8907d08842b5
2020-04-01 03:36:05 +00:00
Goven Liu
783b0257ad
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev
2020-04-01 03:16:34 +00:00
Bill Yi
5f16525806
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ie47208d5573659f3bdcc57c8d9933a2245625669
2020-03-31 20:12:42 -07:00
Sarah Chin
1a963d5f96
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a
am: c03048cd27
-s ours am: 902793ffa7
-s ours am: 8f14309c6a
-s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
is in history
Change-Id: I9f17af1d0a16b58cd4f8ddf38f60c6d51512ae42
2020-04-01 00:02:14 +00:00
Sarah Chin
8f14309c6a
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a
am: c03048cd27
-s ours am: 902793ffa7
-s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
is in history
Change-Id: Iab8f4ddeb21032e44ee74cc18db2b5fd5e3d1cb5
2020-03-31 23:40:46 +00:00
Sarah Chin
902793ffa7
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a
am: c03048cd27
-s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
is in history
Change-Id: I1763402a852df8d830f211313e1b2549bf9f7a05
2020-03-31 23:26:57 +00:00
Sarah Chin
c03048cd27
Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a
...
Change-Id: Ibd354d26acab6e5f8195d4f93b302ec9c362d9be
2020-03-31 23:15:07 +00:00
Sarah Chin
b6fd42a06a
Merge "Rename calls to isGlobalModeEnabled"
2020-03-31 23:02:20 +00:00
Brad Ebinger
7f9b393ead
[automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c
am: 8bc35321d8
-s ours am: 2139c0b50a
-s ours am: 41df03ff47
-s ours
...
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec
is in history
Change-Id: I657bba0abfc075cf7cdd14913b544614bc57e839
2020-03-31 20:53:19 +00:00
Brad Ebinger
2d3a0393d4
[automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a
am: da1335a9f4
-s ours am: 5ef4a92dd0
-s ours am: 3d3a32d3dd
-s ours
...
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a
is in history
Change-Id: Id29c7a058a6cc906203914b68ad4819dd82a6756
2020-03-31 20:53:17 +00:00
TreeHugger Robot
a168a5dee5
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303
am: 0d78f267d8
am: 0b06034144
...
Change-Id: I332f65194900d70b1d4c37f0fdc925051c0dd7d3
2020-03-31 20:52:48 +00:00
Automerger Merge Worker
34f9c3d17d
Merge "Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303
am: e9c4d17eb2
am: 6c2f6a3e0a
am: b7690b92fb" into rvc-qpr-dev-plus-aosp
2020-03-31 20:51:58 +00:00
TreeHugger Robot
3ed02c73ae
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303
am: e9c4d17eb2
am: 6c2f6a3e0a
am: b7690b92fb
...
Change-Id: I8f99bfa084fde52a7403d642e262d0f3998d5dd6
2020-03-31 20:51:54 +00:00
TreeHugger Robot
d444d8b9c3
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e
am: c823a3169b
am: d4aa412835
...
Change-Id: I4ebdb50ef493185676773f69a308e9fa03a2557f
2020-03-31 20:51:46 +00:00
TreeHugger Robot
11e999388f
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e
am: 6e9938cf48
am: 52fec7a9bd
am: 85aca25d5d
...
Change-Id: Ia9c2ac172b7e7caa279a6cccde214909084cb946
2020-03-31 20:51:14 +00:00
TreeHugger Robot
43d299ac8a
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303
am: e9c4d17eb2
am: 81df373d42
...
Change-Id: Ie01db13ac5e553776242f04fc96315465a8a06d8
2020-03-31 20:45:38 +00:00
TreeHugger Robot
85f940b564
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e
am: 6e9938cf48
am: 0035707d32
...
Change-Id: I0690ace142c845067073ddcbfee0c141f99010dc
2020-03-31 20:42:50 +00:00
TreeHugger Robot
b7690b92fb
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303
am: e9c4d17eb2
am: 6c2f6a3e0a
...
Change-Id: Iad3e19db543800dcab83404022b7d3983347a44d
2020-03-31 20:34:10 +00:00
TreeHugger Robot
85aca25d5d
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e
am: 6e9938cf48
am: 52fec7a9bd
...
Change-Id: Iae0665df16c34a2fb71c02033d4b2462cf66deac
2020-03-31 20:33:00 +00:00
Brad Ebinger
41df03ff47
[automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c
am: 8bc35321d8
-s ours am: 2139c0b50a
-s ours
...
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec
is in history
Change-Id: I5e2e7dc6a41689412ba090174d8312bf15ce828a
2020-03-31 20:28:50 +00:00
Brad Ebinger
3d3a32d3dd
[automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a
am: da1335a9f4
-s ours am: 5ef4a92dd0
-s ours
...
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a
is in history
Change-Id: I5ba07f1336bd4d4c5c9af6af38df350752667f55
2020-03-31 20:28:49 +00:00
TreeHugger Robot
0b06034144
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303
am: 0d78f267d8
...
Change-Id: I1be31e7940bb9ff43dcca3753a8cc4390371c797
2020-03-31 20:28:02 +00:00
TreeHugger Robot
6c2f6a3e0a
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303
am: e9c4d17eb2
...
Change-Id: Iae17458890d0195b2396f86c4625dae1bd2cfd48
2020-03-31 20:24:25 +00:00
TreeHugger Robot
d4aa412835
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e
am: c823a3169b
...
Change-Id: I830b29d7328a9d0e0a71e5a208d7c629596b2e60
2020-03-31 20:23:04 +00:00
TreeHugger Robot
81df373d42
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303
am: e9c4d17eb2
...
Change-Id: I12caf300aeefc9a15a97fdbe79598f2bdc538f1c
2020-03-31 20:22:03 +00:00
TreeHugger Robot
3db00ece7a
Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed
am: 249a806fed
am: 31e2de7c48
...
Change-Id: I3feae4a366e138821dbf8af58c15f16c5b30f4cf
2020-03-31 20:21:24 +00:00
TreeHugger Robot
0035707d32
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e
am: 6e9938cf48
...
Change-Id: I9995b090e07d81a3e46be1e9d80e87ab3b098dba
2020-03-31 20:20:53 +00:00
TreeHugger Robot
52fec7a9bd
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e
am: 6e9938cf48
...
Change-Id: I25b23e9af82055cbba5633ffbd889a3a993390c1
2020-03-31 20:20:45 +00:00
TreeHugger Robot
0e41294b94
Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7
am: 8ca191b565
am: 157b568e40
...
Change-Id: Ia8ed3b88e3adf8d94fe3cc16646058d171c18cdd
2020-03-31 20:20:45 +00:00
Brad Ebinger
2139c0b50a
[automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c
am: 8bc35321d8
-s ours
...
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec
is in history
Change-Id: I6ec8cb78adfd5916249bf2364b3bee0c4780b4c8
2020-03-31 20:20:40 +00:00
Brad Ebinger
5ef4a92dd0
[automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a
am: da1335a9f4
-s ours
...
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a
is in history
Change-Id: I94265a2af1e69f1257c93fb05222c79037840156
2020-03-31 20:20:38 +00:00