Commit Graph

70764 Commits

Author SHA1 Message Date
Julia Reynolds
af918b8041 Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: 423fdfa8bb am: 0051068fcb am: 087c3f5bf6
Change-Id: I6d712f7c388bc8bf72559677d7e003960963808e
2020-05-22 12:55:30 +00:00
Julia Reynolds
087c3f5bf6 Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: 423fdfa8bb am: 0051068fcb
Change-Id: I5da6a7997f960ca6a112ce6958c20197447a4846
2020-05-22 12:31:26 +00:00
Julia Reynolds
0051068fcb Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: 423fdfa8bb
Change-Id: I01fa401ce81d6c6f50b4fa4cbf04d621401f899b
2020-05-22 12:19:00 +00:00
Julia Reynolds
423fdfa8bb Update conversation-related strings am: 9e78ec75d1 am: 61e956443d
Change-Id: I124b22d123aa7abf5bbc3adc264478e166cd900d
2020-05-22 12:03:49 +00:00
Julia Reynolds
61e956443d Update conversation-related strings am: 9e78ec75d1
Change-Id: I9fb42f08125dcfd078045c5737bae429870022d5
2020-05-22 11:48:26 +00:00
TreeHugger Robot
1f6783d674 Merge "Add an exported flag in manifest" am: 3954cce0c3
Change-Id: If94db6479f0574ca4d725821a6cbb3e294a0c1e8
2020-05-21 21:22:40 +00:00
Automerger Merge Worker
6e5fdb0b25 Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp am: 74ddcbe020 am: beecea6aec am: 9602ca167f
Change-Id: I95398007fa040f2efceac80643d336aba5face8b
2020-05-21 20:59:20 +00:00
TreeHugger Robot
3954cce0c3 Merge "Add an exported flag in manifest" 2020-05-21 20:50:37 +00:00
Julia Reynolds
9e78ec75d1 Update conversation-related strings
Test: atest
Bug: 157215227
Change-Id: Iba279bb285e53918a1e1b43c04d6ec7576cd48a0
2020-05-21 20:49:53 +00:00
Automerger Merge Worker
9602ca167f Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp am: 74ddcbe020 am: beecea6aec
Change-Id: Ied267fa99c5c09b4740614f8671290ac9aea4b8d
2020-05-21 20:46:22 +00:00
Automerger Merge Worker
9e6f52a5b6 Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: 06554d19ae" into rvc-qpr-dev-plus-aosp am: e33d4e6512 am: a3ca5aac9c
Change-Id: I82135435a912a959044631395f7c7bb8c012b13f
2020-05-21 20:35:34 +00:00
Julia Reynolds
b6132f33e1 Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: a98f5e1445 am: 25d1b428bf am: 75aba32e27
Change-Id: Iba275298b1b3cabad34d457b43bc0311c1905ebe
2020-05-21 20:34:54 +00:00
Automerger Merge Worker
a3ca5aac9c Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: 06554d19ae" into rvc-qpr-dev-plus-aosp am: e33d4e6512
Change-Id: I696182967389c2deccf749607a879b36c38b0875
2020-05-21 20:12:23 +00:00
Julia Reynolds
75aba32e27 Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: a98f5e1445 am: 25d1b428bf
Change-Id: Iddbf702265aa3c17cdd7ad9997f2b76aa22d0b36
2020-05-21 20:11:16 +00:00
Automerger Merge Worker
beecea6aec Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp am: 74ddcbe020
Change-Id: I3233d44bb75457662fca639cbf24cc4d04c15c55
2020-05-21 19:55:49 +00:00
Automerger Merge Worker
e33d4e6512 Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: 06554d19ae" into rvc-qpr-dev-plus-aosp 2020-05-21 19:55:19 +00:00
Julia Reynolds
84fcccfe1f Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: 06554d19ae
Change-Id: Idee4f92953e81e9882ba06ee12c3097273390431
2020-05-21 19:54:53 +00:00
Julia Reynolds
25d1b428bf Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: a98f5e1445
Change-Id: I96e1f7e0a925443f9ad4429f1d4482c0da58198f
2020-05-21 19:54:38 +00:00
Automerger Merge Worker
74ddcbe020 Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp 2020-05-21 19:34:45 +00:00
Julia Reynolds
34e0ebd5dc Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d
Change-Id: I75d636b27d67ce8a549d4d8287755c60c110677e
2020-05-21 19:34:39 +00:00
Julia Reynolds
a98f5e1445 Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d
Change-Id: Iabb72c8e018cf568ae43ac1a24f7d1b7fafbfad7
2020-05-21 19:34:33 +00:00
Julia Reynolds
06554d19ae Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d
Change-Id: I86b8f73b5df03d2e57cb45dc848fbe43301ee8c6
2020-05-21 19:34:26 +00:00
Julia Reynolds
0dc740b13d Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
Change-Id: Ic642152c044aed6a4778ae38b449eabae4f77eb5
2020-05-21 19:17:25 +00:00
Julia Reynolds
22ac6baf3d Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
Change-Id: I84fb7adb02d4b7731327e531cddd48171bd4329b
2020-05-21 19:16:53 +00:00
Julia Reynolds
6d63120295 Merge "Switch from shortlabel to label" into rvc-dev 2020-05-21 18:53:24 +00:00
Robert Luo
816f909e65 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: fa85b4e1f6 am: c47bdeb62f am: b88826ad1b am: 06b722df8f
Change-Id: I5ac162f5f42d2f21f6af27f2059e62e564a7da5d
2020-05-21 16:48:37 +00:00
Robert Luo
b5e15bacf8 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425 am: 09751770db am: 1a7f615f53 am: 425f771865
Change-Id: Ic0fc46ca194e71b38fa8809b2a87ae26fa21a930
2020-05-21 16:45:11 +00:00
Robert Luo
b24e3a03ca Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425 am: b15149a1eb am: d6fd16d704 am: 0a55d211ac
Change-Id: I64e2be8f99fd9dc7673205773e65c72b54bdc1ea
2020-05-21 16:44:36 +00:00
Robert Luo
06b722df8f Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: fa85b4e1f6 am: c47bdeb62f am: b88826ad1b
Change-Id: I1b8e50bd89d0ac66de0f9077d75114b25bab8277
2020-05-21 16:27:35 +00:00
Robert Luo
425f771865 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425 am: 09751770db am: 1a7f615f53
Change-Id: I3f244437b2c90b2025d58b6aa52c37ae599136ee
2020-05-21 16:21:46 +00:00
Robert Luo
0a55d211ac Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425 am: b15149a1eb am: d6fd16d704
Change-Id: I423a5e79282f8508750789fbf6cf0150266df3af
2020-05-21 16:20:48 +00:00
Robert Luo
b88826ad1b Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: fa85b4e1f6 am: c47bdeb62f
Change-Id: Id77ae49659ba09a5bf9d2a493b3b0d2e25875e8e
2020-05-21 15:59:42 +00:00
Robert Luo
1a7f615f53 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425 am: 09751770db
Change-Id: I074b93b3a1998ce89e89132ca7d15993402f2c4a
2020-05-21 15:58:31 +00:00
Robert Luo
d6fd16d704 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425 am: b15149a1eb
Change-Id: I0e875b6117d1c3a6afde37f6e9c6c8aa696bc053
2020-05-21 15:58:22 +00:00
Robert Luo
c47bdeb62f Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: fa85b4e1f6
Change-Id: I28cf36ad0dc3c278af23cca880075bf7ffc79e07
2020-05-21 15:33:16 +00:00
Robert Luo
b15149a1eb Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425
Change-Id: I5557b6c9dc3eeb82497f16ea1fdf912e26cfaa86
2020-05-21 15:33:03 +00:00
Robert Luo
09751770db Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425
Change-Id: I6ebc46eb67ea2e97d1c51774a7bc4f68d828032b
2020-05-21 15:32:56 +00:00
Robert Luo
fa85b4e1f6 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
Change-Id: I0e65ecc63313558f55c4ed1d0b6a4e263913610b
2020-05-21 15:08:49 +00:00
Robert Luo
83fa4e6425 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
Change-Id: I9c81a2973ffcb3416390417c48a72e3635bec0c4
2020-05-21 15:08:31 +00:00
Robert Luo
31f96bbcf6 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev 2020-05-21 14:56:54 +00:00
Automerger Merge Worker
5d4610a492 Merge "Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 am: b29c7c49e7" into rvc-qpr-dev-plus-aosp am: 22bcdc79cd am: 8b1499a7ee
Change-Id: Ib2c711c42aed9568073a21210d351a3ebb206144
2020-05-21 13:16:25 +00:00
TreeHugger Robot
6157ea181d Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9a9490e6b9 am: 9316cd31e7 am: 48f895f0a0
Change-Id: Ice88a8c55fdaff073e929ad2a775c3febfeb2e48
2020-05-21 13:16:18 +00:00
TreeHugger Robot
8e458ac69e Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9e5d3a8805 am: 37f19e547d am: fe4d120cc8
Change-Id: Ibfb8838d1bfa24eef00ea7d4cb519d1e214f2350
2020-05-21 13:16:06 +00:00
Automerger Merge Worker
8b1499a7ee Merge "Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 am: b29c7c49e7" into rvc-qpr-dev-plus-aosp am: 22bcdc79cd
Change-Id: I22ca4a035573fcf28133ae9693ce771e1b1f277c
2020-05-21 13:01:42 +00:00
TreeHugger Robot
48f895f0a0 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9a9490e6b9 am: 9316cd31e7
Change-Id: I68930d17a0f7501598db7375dea7ae03d857e16c
2020-05-21 13:01:33 +00:00
TreeHugger Robot
fe4d120cc8 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9e5d3a8805 am: 37f19e547d
Change-Id: I3f100b7a0c786525bf02ee30dcdbc4ee98cf3917
2020-05-21 13:01:23 +00:00
Automerger Merge Worker
22bcdc79cd Merge "Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 am: b29c7c49e7" into rvc-qpr-dev-plus-aosp 2020-05-21 12:46:42 +00:00
TreeHugger Robot
640f3cec66 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 am: b29c7c49e7
Change-Id: I31e51425df7c1156b1a5266d665f0d60ce82e5c2
2020-05-21 12:46:37 +00:00
TreeHugger Robot
9316cd31e7 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9a9490e6b9
Change-Id: I97499ad374d60634f6d71f6bb76c76307718da4c
2020-05-21 12:46:31 +00:00
TreeHugger Robot
37f19e547d Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9e5d3a8805
Change-Id: I86a4c1678b1566135d0c1d3e8ef519598bc4e100
2020-05-21 12:46:10 +00:00