Commit Graph

69259 Commits

Author SHA1 Message Date
TreeHugger Robot
e9406ca30a Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: d127bdc14a am: 727aa42a94 am: 0d58f34da4
Change-Id: I203c75ee1434bc6dca85debcd90de6789004036e
2020-05-16 00:06:39 +00:00
TreeHugger Robot
07c525c487 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e am: 2806494683 am: e8d332dc54
Change-Id: I035d09faa19a1269adf361a5e0cfdb8c9d74eb8b
2020-05-16 00:06:05 +00:00
Julia Reynolds
32d189fbfe Add settings for apps that don't use full conversations am: eca1e4d197 am: 33e6708f75 am: 2ae175233b am: 6a87cdcd50
Change-Id: Ic01e59c4462f51128cd9b425075087459add3057
2020-05-16 00:06:02 +00:00
TreeHugger Robot
463a664f49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: e515101a1c -s ours am: 0b0bfd5bf3 -s ours am: c491a6522d -s ours
am skip reason: subject contains skip directive

Change-Id: I032d029a026e824cf9b3e812374ab010a6e73208
2020-05-16 00:04:13 +00:00
Automerger Merge Worker
cb0e51f169 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: d50f81964a -s ours" into rvc-qpr-dev-plus-aosp am: 892e7208df -s ours
am skip reason: subject contains skip directive

Change-Id: Ie498c6933c7e328c232cb882fe4fa6e5bda61984
2020-05-16 00:03:54 +00:00
Automerger Merge Worker
ca2d77c6c0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: 10ab1e1e8b -s ours" into rvc-qpr-dev-plus-aosp am: d73663a4a6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibdac7372b9c55fa8139f69efb3b2a1f3c0b52526
2020-05-16 00:03:33 +00:00
Automerger Merge Worker
cdf7616e8e Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 04ced7e940 -s ours am: 6051f64b1f -s ours" into rvc-qpr-dev-plus-aosp am: 62fefe2693 -s ours
am skip reason: subject contains skip directive

Change-Id: I99a2cb877419bc20e30b32d6a12b70b4aaacd59d
2020-05-16 00:03:02 +00:00
TreeHugger Robot
42b0612e0e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours am: 0736ea6e03 -s ours am: c9b95a3719 -s ours
am skip reason: subject contains skip directive

Change-Id: I37a498a8ef269fa5257d0e06ce4832ff85f78e29
2020-05-16 00:02:04 +00:00
TreeHugger Robot
998930e0ce [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours am: 2b52ac3be1 -s ours am: 45e0004cf7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib0e0cb8d154fac8c2f7a7207fea2b0cce5564e8c
2020-05-16 00:01:30 +00:00
TreeHugger Robot
4a89b38fc1 Merge "Import translations. DO NOT MERGE" 2020-05-15 23:58:19 +00:00
TreeHugger Robot
0d58f34da4 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: d127bdc14a am: 727aa42a94
Change-Id: I2e66118ecbbbb248453ff1299cc5507f10fea655
2020-05-15 23:51:06 +00:00
TreeHugger Robot
e8d332dc54 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e am: 2806494683
Change-Id: Ibbdc8174b333a6ddeb867da31f4c34d765167835
2020-05-15 23:50:32 +00:00
Julia Reynolds
6a87cdcd50 Add settings for apps that don't use full conversations am: eca1e4d197 am: 33e6708f75 am: 2ae175233b
Change-Id: I6be478c823a49ca5066e0a80f182cdaf1391d946
2020-05-15 23:50:29 +00:00
TreeHugger Robot
c491a6522d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: e515101a1c -s ours am: 0b0bfd5bf3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6ab149c072dd3bec5af184cd2f215f584e81d7e
2020-05-15 23:48:14 +00:00
Automerger Merge Worker
892e7208df Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: d50f81964a -s ours" into rvc-qpr-dev-plus-aosp 2020-05-15 23:48:12 +00:00
Automerger Merge Worker
d73663a4a6 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: 10ab1e1e8b -s ours" into rvc-qpr-dev-plus-aosp 2020-05-15 23:48:10 +00:00
TreeHugger Robot
65f4c33a89 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: d50f81964a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic0c24719b0bc7c9d6f788360624f2e574b5fbf93
2020-05-15 23:48:09 +00:00
Automerger Merge Worker
62fefe2693 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 04ced7e940 -s ours am: 6051f64b1f -s ours" into rvc-qpr-dev-plus-aosp 2020-05-15 23:48:07 +00:00
TreeHugger Robot
25d50e8554 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: 10ab1e1e8b -s ours
am skip reason: subject contains skip directive

Change-Id: I947b107ad8f031170ea1d4b0d883977ec4b2129c
2020-05-15 23:48:06 +00:00
TreeHugger Robot
82ca756925 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 04ced7e940 -s ours am: 6051f64b1f -s ours
am skip reason: subject contains skip directive

Change-Id: I114420e44695a76b06ac1e1c68fea6d27ef170e4
2020-05-15 23:48:03 +00:00
TreeHugger Robot
c9b95a3719 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours am: 0736ea6e03 -s ours
am skip reason: subject contains skip directive

Change-Id: I4019d24055d2d41079e4d748c9815a89037d1eb7
2020-05-15 23:48:01 +00:00
TreeHugger Robot
45e0004cf7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours am: 2b52ac3be1 -s ours
am skip reason: subject contains skip directive

Change-Id: I21c42bb9fd16038a2a6a1a7be30ab528497e45d8
2020-05-15 23:47:50 +00:00
TreeHugger Robot
727aa42a94 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: d127bdc14a
Change-Id: If91efd066bfa439f1840a5dc774da96331cef303
2020-05-15 23:45:59 +00:00
TreeHugger Robot
2806494683 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e
Change-Id: I674ec92dbe8ec7f0c5486ecf08bd9ddba7065996
2020-05-15 23:45:36 +00:00
Julia Reynolds
2ae175233b Add settings for apps that don't use full conversations am: eca1e4d197 am: 33e6708f75
Change-Id: I6ccfcafac1a64842e227e9657c0ccee57bea103d
2020-05-15 23:45:34 +00:00
TreeHugger Robot
0217cbd19e Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea
Change-Id: If57ab8c7d45fbd771b5be23aa5812cdb9e0b35e5
2020-05-15 23:39:09 +00:00
Julia Reynolds
33e6708f75 Add settings for apps that don't use full conversations am: eca1e4d197
Change-Id: I3360ffd3f7975346f24d0943912cc31b88b2a07d
2020-05-15 23:39:06 +00:00
TreeHugger Robot
d127bdc14a Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea
Change-Id: I18305781e02f5c14c5c2b192e922d0294420cbf9
2020-05-15 23:38:24 +00:00
TreeHugger Robot
4bbe564aea Merge changes from topic "jr-update" into rvc-dev
* changes:
  Update conversation launch point
  Add settings for apps that don't use full conversations
2020-05-15 23:35:06 +00:00
TreeHugger Robot
0b0bfd5bf3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: e515101a1c -s ours
am skip reason: subject contains skip directive

Change-Id: Ieadbc12622c84194a8c268db0e6340b94e91c334
2020-05-15 23:33:23 +00:00
TreeHugger Robot
d50f81964a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours
am skip reason: subject contains skip directive

Change-Id: I9ce753c56255ff5761ec97e77383d54e26407dcc
2020-05-15 23:33:16 +00:00
TreeHugger Robot
80fedcc209 Merge "Import translations. DO NOT MERGE" 2020-05-15 23:32:57 +00:00
TreeHugger Robot
10ab1e1e8b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours
am skip reason: subject contains skip directive

Change-Id: Ia85b67e00108440d4e5f5cefee08f85daddf23a2
2020-05-15 23:32:53 +00:00
TreeHugger Robot
6051f64b1f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 04ced7e940 -s ours
am skip reason: subject contains skip directive

Change-Id: I020debdc0ae7265ec55d988eef63c9bdb5d4a904
2020-05-15 23:32:50 +00:00
TreeHugger Robot
0736ea6e03 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours
am skip reason: subject contains skip directive

Change-Id: I201eb0bcaf8e23ff57a393b6cebb84447832f714
2020-05-15 23:32:41 +00:00
TreeHugger Robot
2b52ac3be1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib1abd856f01b4b465a73cfc38a696f2be11e5327
2020-05-15 23:32:32 +00:00
TreeHugger Robot
e515101a1c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours
am skip reason: subject contains skip directive

Change-Id: I5f46d6eb42d31a8784136077ab22cc654f8345ed
2020-05-15 23:25:56 +00:00
TreeHugger Robot
30738191dc [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibf3b226075a48d1768917f411753ae8f00b3d1f0
2020-05-15 23:25:51 +00:00
TreeHugger Robot
a264157438 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-15 23:21:28 +00:00
TreeHugger Robot
753c885c08 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4c632199a55c066c9ae45b82fe9ed28233c5227
2020-05-15 23:19:37 +00:00
TreeHugger Robot
04ced7e940 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours
am skip reason: subject contains skip directive

Change-Id: I3b869d614495efc34ad2f0348694e4141de49d93
2020-05-15 23:19:29 +00:00
TreeHugger Robot
3d94e341ea [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours am: 57f73fff09 -s ours am: 98d19cb1d5 -s ours
am skip reason: subject contains skip directive

Change-Id: I00c4114e6b0ad7eb5acd97fad650fdfd4d134e97
2020-05-15 23:12:31 +00:00
TreeHugger Robot
069874f09b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours am: 3845234a31 -s ours am: d9423bb281 -s ours
am skip reason: subject contains skip directive

Change-Id: If29fb47b56fb3f4437e86b9efd519f90ca96a5cd
2020-05-15 23:12:11 +00:00
TreeHugger Robot
d11650eaf9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours am: 7b104cf937 -s ours am: 967c0ca449 -s ours
am skip reason: subject contains skip directive

Change-Id: Ica68e4dd62bbf8486b11fc36071c7f2eba7d51b2
2020-05-15 23:11:38 +00:00
TreeHugger Robot
ac8072ff3b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours am: ae2531ed5d -s ours am: b7b4996258 -s ours
am skip reason: subject contains skip directive

Change-Id: Ied08ca481d079d5b2d3bfed2e76dc0ddf1da112a
2020-05-15 23:06:01 +00:00
TreeHugger Robot
a9ef11f243 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-15 23:05:04 +00:00
TreeHugger Robot
98d19cb1d5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours am: 57f73fff09 -s ours
am skip reason: subject contains skip directive

Change-Id: I8af547f500e4f3876880f1c06d49cd47cecbdf79
2020-05-15 22:47:01 +00:00
TreeHugger Robot
d9423bb281 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: aa76705149 -s ours am: 3845234a31 -s ours
am skip reason: subject contains skip directive

Change-Id: I0ed3b78dbf10b4181ebc6d95d30e194961c76285
2020-05-15 22:43:50 +00:00
TreeHugger Robot
967c0ca449 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours am: 7b104cf937 -s ours
am skip reason: subject contains skip directive

Change-Id: I60d512de3a6ebffdb0547145e6ce5e45f859fdc5
2020-05-15 22:43:44 +00:00
TreeHugger Robot
b7b4996258 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f94e4f739e -s ours am: ae2531ed5d -s ours
am skip reason: subject contains skip directive

Change-Id: I6024ea3f05d8c2a9040610d75514499b89c643a3
2020-05-15 22:42:54 +00:00