filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,351 Commits 1 Branch 0 Tags
bc93ce392e2fc803ec0d8f87a14bf732d9b2fb87
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li da757e89e7 [automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 66fe5627e6 -s ours 
am skip reason: Merged-In I102674aa519cf562aa8d0b852ebb8067748894a6 with SHA-1 c6b06859a3 is already in history

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

Change-Id: I6a1c0c5ec8d62cd88132156494ed592e2e113ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 05:27:40 +00:00
Xin Li 66fe5627e6 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future 
Bug: 337098550
Merged-In: I102674aa519cf562aa8d0b852ebb8067748894a6
Change-Id: I7d4c5e5a30eb6b63834adfaee83d44c8836c66f4
 2024-05-06 12:09:30 -07:00
Xin Li b27f3f6520 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: a268d72062 -s ours am: 50ca63eef5 -s ours 
am skip reason: Merged-In I3a7b6043fc086e561ff08cfe2aa62b63d7111725 with SHA-1 39d9a7cff7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2989100

Change-Id: I8a0710835664cfe17976f1db49acd68f84c786f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 10:46:34 +00:00
Xin Li 50ca63eef5 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: a268d72062 -s ours 
am skip reason: Merged-In I3a7b6043fc086e561ff08cfe2aa62b63d7111725 with SHA-1 39d9a7cff7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2989100

Change-Id: I5da36e55150f5b797e25dfc8b061e0083fcac675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 09:55:09 +00:00
Xin Li a268d72062 Merge Android 14 QPR2 to AOSP main 
Bug: 319669529
Merged-In: I3a7b6043fc086e561ff08cfe2aa62b63d7111725
Change-Id: Ie3b6eef7da0cfdc72cc9d8fe38b5496bb4fe5a61
 2024-03-06 09:30:05 -08:00
Xin Li bfd0c08fef [automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 39d9a7cff7 -s ours 
am skip reason: Merged-In I02e57588433b5ff1e4d2208c172b904deb8d8236 with SHA-1 3586032a9b is already in history

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

Change-Id: I2c2491a5436857459bad32495b4cd549f57fe094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-31 02:02:43 +00:00
Xin Li 39d9a7cff7 Merge Android 24Q1 Release (ab/11220357) 
Bug: 319669529
Merged-In: I02e57588433b5ff1e4d2208c172b904deb8d8236
Change-Id: I3a7b6043fc086e561ff08cfe2aa62b63d7111725
 2024-01-17 22:14:21 -08:00
Xin Li 5be25836a4 [automerger skipped] Merge Android 14 am: 7ccb8281ea -s ours am: b23aab5b58 -s ours am: de669852b7 -s ours am: 068bef5cd2 -s ours am: 21ffdb9699 -s ours 
am skip reason: Merged-In Ib6aea146a33329d3f6c1e375e99f600699318ce4 with SHA-1 3aeba4cab6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2775116

Change-Id: I7c547775e273c27b7c292714321499c4cd160acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:19:48 +00:00
Xin Li 21ffdb9699 [automerger skipped] Merge Android 14 am: 7ccb8281ea -s ours am: b23aab5b58 -s ours am: de669852b7 -s ours am: 068bef5cd2 -s ours 
am skip reason: Merged-In Ib6aea146a33329d3f6c1e375e99f600699318ce4 with SHA-1 3aeba4cab6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2775116

Change-Id: Ib33955469048b81b040d8139d036fec1c6d451cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:00:18 +00:00
Xin Li 068bef5cd2 [automerger skipped] Merge Android 14 am: 7ccb8281ea -s ours am: b23aab5b58 -s ours am: de669852b7 -s ours 
am skip reason: Merged-In Ib6aea146a33329d3f6c1e375e99f600699318ce4 with SHA-1 3aeba4cab6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2775116

Change-Id: I7aba0fe536bf6e507e81fd4c536bbf66cc903a8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:50:27 +00:00
Xin Li de669852b7 [automerger skipped] Merge Android 14 am: 7ccb8281ea -s ours am: b23aab5b58 -s ours 
am skip reason: Merged-In Ib6aea146a33329d3f6c1e375e99f600699318ce4 with SHA-1 3aeba4cab6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2775116

Change-Id: I4990ea9428eeb162ebdb8a56c9610e55b66c1224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 08:58:50 +00:00
Xin Li b23aab5b58 [automerger skipped] Merge Android 14 am: 7ccb8281ea -s ours 
am skip reason: Merged-In Ib6aea146a33329d3f6c1e375e99f600699318ce4 with SHA-1 3aeba4cab6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2775116

Change-Id: I91c431bae0e1fa66166a4c7fe8da09937c96a7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:51:47 +00:00
Xin Li 7ccb8281ea Merge Android 14 
Bug: 298295554
Merged-In: Ib6aea146a33329d3f6c1e375e99f600699318ce4
Change-Id: Id645358f0476a48beaa6f660132adc89da0d9508
 2023-10-05 15:41:44 -07:00
Xin Li 5844c8d040 [automerger skipped] Merge Android U (ab/10368041) am: cc70e7f912 -s ours am: 8a038cdcc8 -s ours am: 8bdb7813ea -s ours am: 63fab7797c -s ours 
am skip reason: Merged-In I14048e3a7575f49da4cc945f32d2df839a4f0a00 with SHA-1 ec2af4c798 is already in history

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

Change-Id: I8a89c29af274fc057d55da3171d0e200fca3d786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 20:37:43 +00:00
Xin Li 63fab7797c [automerger skipped] Merge Android U (ab/10368041) am: cc70e7f912 -s ours am: 8a038cdcc8 -s ours am: 8bdb7813ea -s ours 
am skip reason: Merged-In I14048e3a7575f49da4cc945f32d2df839a4f0a00 with SHA-1 ec2af4c798 is already in history

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

Change-Id: I1cb8b431e8e73090862261cd733b69f868e58cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 01:10:38 +00:00
Xin Li 8bdb7813ea [automerger skipped] Merge Android U (ab/10368041) am: cc70e7f912 -s ours am: 8a038cdcc8 -s ours 
am skip reason: Merged-In I14048e3a7575f49da4cc945f32d2df839a4f0a00 with SHA-1 ec2af4c798 is already in history

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

Change-Id: Icd26913e7fd9cc9607c2b7d5ccc7eeee485f89f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 00:34:54 +00:00
Xin Li 8a038cdcc8 [automerger skipped] Merge Android U (ab/10368041) am: cc70e7f912 -s ours 
am skip reason: Merged-In I14048e3a7575f49da4cc945f32d2df839a4f0a00 with SHA-1 ec2af4c798 is already in history

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

Change-Id: I56d6bf507dafae1aa378d56fb916ae86ac49bae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 23:58:54 +00:00
Xin Li cc70e7f912 Merge Android U (ab/10368041) 
Bug: 291102124
Merged-In: I14048e3a7575f49da4cc945f32d2df839a4f0a00
Change-Id: If29d13904ad08d858094db9dd4b4abace9ce81b9
 2023-08-14 15:42:05 -07:00
Xin Li 68b504898a [automerger skipped] DO NOT MERGE - Merge Android 13 am: aee8039030 -s ours am: 0e6cdf2eb7 -s ours am: ad83b97fc2 -s ours am: ecdfb3e761 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186587

Change-Id: Ia9b01e428c22d660ee142dbcd03fcef3a2b02057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 06:50:34 +00:00
Xin Li ecdfb3e761 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aee8039030 -s ours am: 0e6cdf2eb7 -s ours am: ad83b97fc2 -s ours 
am skip reason: Merged-In Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97 with SHA-1 909a0763c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186587

Change-Id: If55ad601b9c596aa24b61a65a94a2f5a34d54648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:55:30 +00:00
Xin Li ad83b97fc2 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aee8039030 -s ours am: 0e6cdf2eb7 -s ours 
am skip reason: Merged-In Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97 with SHA-1 909a0763c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186587

Change-Id: I1523d98dbb1656e2576661952c89468da72068c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:59:35 +00:00
Xin Li 0e6cdf2eb7 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aee8039030 -s ours 
am skip reason: Merged-In Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97 with SHA-1 909a0763c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186587

Change-Id: I2c6d39abd94c84fc897cf0b69db9ccc543b5c428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:15:15 +00:00
Xin Li aee8039030 DO NOT MERGE - Merge Android 13 
Bug: 242648940
Merged-In: Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97
Change-Id: If921e7f572b3c1a867b20042acc58ae7c9e26821
 2022-08-15 22:04:33 -07:00
Xin Li 350a8b2268 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours am: 43050c5ad2 -s ours am: 96b21cc97f -s ours am: 8770af9794 -s ours 
am skip reason: Merged-In I81c01202306d856f6f8f8b74a5a28d7c1011fcec with SHA-1 c8e4ab2b22 is already in history

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

Change-Id: Ie1fce3e57167bbae65efe3ba0739106f66d8e68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 01:04:36 +00:00
Xin Li 8770af9794 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours am: 43050c5ad2 -s ours am: 96b21cc97f -s ours 
am skip reason: Merged-In I81c01202306d856f6f8f8b74a5a28d7c1011fcec with SHA-1 c8e4ab2b22 is already in history

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

Change-Id: I58954b9d773b4bb974d8b1393eeff2dd45ed31c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 00:02:03 +00:00
Xin Li 96b21cc97f [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours am: 43050c5ad2 -s ours 
am skip reason: Merged-In I81c01202306d856f6f8f8b74a5a28d7c1011fcec with SHA-1 c8e4ab2b22 is already in history

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

Change-Id: I2d2df7ef4ced6973181ee723a6ae4581f1169f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:56:19 +00:00
Xin Li 43050c5ad2 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours 
am skip reason: Merged-In I81c01202306d856f6f8f8b74a5a28d7c1011fcec with SHA-1 c8e4ab2b22 is already in history

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

Change-Id: I1457040a83a4aa8289a66da4d95571bc18195390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:12:49 +00:00
Xin Li a2874315eb Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: I81c01202306d856f6f8f8b74a5a28d7c1011fcec
Change-Id: If491aeefb40d37249174a40dfe1e37a978addf73
 2022-06-27 23:39:10 +00:00
Xin Li 7d58fa9093 [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours am: c91ff4436a -s ours am: bb06e4f527 -s ours am: ffc5132b01 -s ours am: e004281f74 -s ours 
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2126162

Change-Id: Ibd5f0e277b3a1d13e427f9d74556878c15bf5255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:33:37 +00:00
Xin Li e004281f74 [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours am: c91ff4436a -s ours am: bb06e4f527 -s ours am: ffc5132b01 -s ours 
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2126162

Change-Id: I509fdb7694320add16e847b03d76d8b5a2491c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:52:45 +00:00
Xin Li ffc5132b01 [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours am: c91ff4436a -s ours am: bb06e4f527 -s ours 
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2126162

Change-Id: I0d8771157d0c48a14cd65a13c8089a5da9b1b086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:56:26 +00:00
Xin Li bb06e4f527 [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours am: c91ff4436a -s ours 
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2126162

Change-Id: Ie3737929b03bb869fe74c29bdba5398378f30f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:14:21 +00:00
Xin Li c91ff4436a [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours 
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2126162

Change-Id: Iccb1cc0fb8871540c5cb8ad3f85aa0a207e5691c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:57:15 +00:00
Xin Li 41406c606f Merge Android 12 QPR 3 
Bug: 236045730
Merged-In: I4bdcc5893b6b437afa79f3bc138d1523c1d8431a
Change-Id: If485b9baf115a05eef5942859a54287233b3f171
 2022-06-14 16:48:16 -07:00
Xin Li daf72d8edc [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours am: 4c2aea615e -s ours am: e469e5653c -s ours am: 1049de0c95 -s ours 
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: Idab5311021bc07254d31257b7defc3439501a252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 09:38:57 +00:00
Xin Li 1049de0c95 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours am: 4c2aea615e -s ours am: e469e5653c -s ours 
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: Iefdf5a4be2b176421ef0796445c9e634cb60b795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 09:08:48 +00:00
Xin Li 293a512c88 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours am: 4c2aea615e -s ours am: 68710ada8e -s ours 
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: Ib1fff9fffd69d1efb1b1409a27e78b0d8c012ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 09:00:33 +00:00
Xin Li e469e5653c [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours am: 4c2aea615e -s ours 
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: I6dbc9aa6d39a261bf40261781c92d2021b959b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 08:30:54 +00:00
Xin Li 68710ada8e [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours am: 4c2aea615e -s ours 
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: I4aa7de25379c42fd9a608e43bb1ad4ae4baae8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 08:29:39 +00:00
Xin Li 4c2aea615e [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours 
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: I5386b5d8ce49cb196bd6ba53233e2720ebfe8425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:43:45 +00:00
Xin Li 5c7e5e1755 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours 
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: I4bdcc5893b6b437afa79f3bc138d1523c1d8431a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:11:44 +00:00
Xin Li 1ee3a18167 Merge Android 12 QPR3 ab/8391262 
Bug: 226662282
Merged-In: Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a
Change-Id: I08874ce0b74b20d356ade7da168a56ffb129ab48
 2022-04-01 20:32:45 +00:00
Xin Li f4ec8cecd3 [automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours am: 4e663f05f7 -s ours am: 15abda616f -s ours am: efe9757e30 -s ours 
am skip reason: Merged-In I0f76e316e9e7f504b92e157799074e4c5606adbf with SHA-1 e6b2cd3620 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2013097

Change-Id: I8999ccf608a23b5764e61969c97245a6f195c6ee
 2022-03-09 12:06:29 +00:00
Xin Li 150f45c98e [automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours am: 4e663f05f7 -s ours am: 15abda616f -s ours 
am skip reason: Merged-In I0f76e316e9e7f504b92e157799074e4c5606adbf with SHA-1 e6b2cd3620 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2013097

Change-Id: Id52fbeab93c4ef4019cd82e9b2a57b0706a45908
 2022-03-09 11:36:37 +00:00
Xin Li efe9757e30 [automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours am: 4e663f05f7 -s ours am: 15abda616f -s ours 
am skip reason: Merged-In I0f76e316e9e7f504b92e157799074e4c5606adbf with SHA-1 e6b2cd3620 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2013097

Change-Id: I162db491d7700f35434f407918282506226550aa
 2022-03-09 11:36:23 +00:00
Xin Li 15abda616f [automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours am: 4e663f05f7 -s ours 
am skip reason: Merged-In I0f76e316e9e7f504b92e157799074e4c5606adbf with SHA-1 e6b2cd3620 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2013097

Change-Id: I0e96634a2c060868fcd02a5d21270f4ed2fab6d5
 2022-03-09 10:02:27 +00:00
Xin Li 4e663f05f7 [automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours 
am skip reason: Merged-In I0f76e316e9e7f504b92e157799074e4c5606adbf with SHA-1 e6b2cd3620 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2013097

Change-Id: Ie75fb77cf964d5462299062dda15acd5c6df5ddf
 2022-03-08 11:03:57 +00:00
Xin Li 184899bbeb [automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours 
am skip reason: Merged-In I0f76e316e9e7f504b92e157799074e4c5606adbf with SHA-1 e6b2cd3620 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2013097

Change-Id: Ia35580122aba527bdd2c5b2f84fb6a4ae72e858a
 2022-03-08 10:19:06 +00:00
Xin Li e9d328d6a6 Merge Android 12L 
Bug: 222710654
Merged-In: I0f76e316e9e7f504b92e157799074e4c5606adbf
Change-Id: Idad44c9d2adeb6207c021dcf5aa29049fee9020e
 2022-03-08 00:19:21 +00:00
Xin Li 40f2450014 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 5317cefc43 -s ours am: a691b0d558 -s ours 
am skip reason: Merged-In I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3 with SHA-1 6e0ca56095 is already in history

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

Change-Id: I942c9338d7b3615aeb34e9b56e00baa7f222533b
 2022-02-14 18:21:01 +00:00
Xin Li a691b0d558 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 5317cefc43 -s ours 
am skip reason: Merged-In I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3 with SHA-1 6e0ca56095 is already in history

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

Change-Id: I62d68395a27640e2f9efb7f2a8cd5f6e7547a4ad
 2022-02-14 18:03:38 +00:00
Xin Li 5317cefc43 Merge sc-v2-dev-plus-aosp-without-vendor@8084891 
Bug: 214455710
Merged-In: I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3
Change-Id: I55e7b412d1bdf2b42ee4d06b6268c04c37a2f893
 2022-02-11 06:57:43 +00:00
Xin Li f3a176524c [automerger skipped] Merge Android 12 QPR1 am: fb6c10a89f -s ours am: 19cc2c724e -s ours am: df1e258c61 -s ours am: 0711c6dee7 -s ours 
am skip reason: Merged-In Id864894b14fd0ab784a093ec203d31200c933f88 with SHA-1 6aa775678a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1921967

Change-Id: Ie49c4f2c8056eaf2d004df26aa2a2e6b4b04128c
 2021-12-14 22:19:35 +00:00
Xin Li 0711c6dee7 [automerger skipped] Merge Android 12 QPR1 am: fb6c10a89f -s ours am: 19cc2c724e -s ours am: df1e258c61 -s ours 
am skip reason: Merged-In Id864894b14fd0ab784a093ec203d31200c933f88 with SHA-1 6aa775678a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1921967

Change-Id: Ie422ed098b0e0f8ecb0ca571c6a13f27fde7efe3
 2021-12-14 21:51:10 +00:00
Xin Li df1e258c61 [automerger skipped] Merge Android 12 QPR1 am: fb6c10a89f -s ours am: 19cc2c724e -s ours 
am skip reason: Merged-In Id864894b14fd0ab784a093ec203d31200c933f88 with SHA-1 6aa775678a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1921967

Change-Id: I0410428632a1cd93be6a68eec08e301312390b2b
 2021-12-14 21:24:20 +00:00
Xin Li 19cc2c724e [automerger skipped] Merge Android 12 QPR1 am: fb6c10a89f -s ours 
am skip reason: Merged-In Id864894b14fd0ab784a093ec203d31200c933f88 with SHA-1 6aa775678a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1921967

Change-Id: I75f77db00e6e2b0dce3aa955630e2d04421e57b9
 2021-12-14 21:00:25 +00:00
Xin Li fb6c10a89f Merge Android 12 QPR1 
Bug: 210511427
Merged-In: Id864894b14fd0ab784a093ec203d31200c933f88
Change-Id: I1402358d4ef814caff2bb76bed71541c3a5ead64
 2021-12-14 08:39:12 -08:00
Xin Li 2f8be13bdf [automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 6aa775678a -s ours am: 502d4d8558 -s ours am: c93c122f0e -s ours 
am skip reason: Merged-In I54b996561d0248a4636e0991545cbfc0700e1ee4 with SHA-1 8a9e12764a is already in history

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

Change-Id: I94e7dd3c69279eed12ff94f02b7b17570bd9878e
 2021-11-18 04:11:56 +00:00
Xin Li c93c122f0e [automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 6aa775678a -s ours am: 502d4d8558 -s ours 
am skip reason: Merged-In I54b996561d0248a4636e0991545cbfc0700e1ee4 with SHA-1 8a9e12764a is already in history

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

Change-Id: I74a8c185f249d969ead5d43cd637ade304f22841
 2021-11-18 03:52:41 +00:00
Xin Li 502d4d8558 [automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 6aa775678a -s ours 
am skip reason: Merged-In I54b996561d0248a4636e0991545cbfc0700e1ee4 with SHA-1 8a9e12764a is already in history

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

Change-Id: Ifc6d8976c3bb9bfffd308dac45c5c8b41172ccc4
 2021-11-18 03:37:17 +00:00
Xin Li 6aa775678a Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 
Bug: 205056467
Merged-In: I54b996561d0248a4636e0991545cbfc0700e1ee4
Change-Id: Id864894b14fd0ab784a093ec203d31200c933f88
 2021-11-10 08:06:09 +00:00
Xin Li 9abb1bc051 [automerger skipped] Mark ab/7061308 as merged in stage. am: f59c740083 -s ours am: af3ff93aba -s ours am: d77a1c1158 -s ours 
am skip reason: Change-Id I26b0f374e227cba084ab4c794253a3d5347be363 with SHA-1 7310312ac1 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19493d785b7cb9be2d92fac2d6a2af0cf37b4653
 2021-02-21 20:14:17 +00:00
Xin Li d77a1c1158 [automerger skipped] Mark ab/7061308 as merged in stage. am: f59c740083 -s ours am: af3ff93aba -s ours 
am skip reason: Change-Id I26b0f374e227cba084ab4c794253a3d5347be363 with SHA-1 7310312ac1 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6394735b5e61cd68930099892afc0866843e3a2a
 2021-02-21 19:08:29 +00:00
Xin Li af3ff93aba [automerger skipped] Mark ab/7061308 as merged in stage. am: f59c740083 -s ours 
am skip reason: Change-Id I26b0f374e227cba084ab4c794253a3d5347be363 with SHA-1 7310312ac1 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9a65ca482f2147310d67a3417c3be8de9e0a6a2
 2021-02-20 14:54:59 +00:00
Xin Li f59c740083 Mark ab/7061308 as merged in stage. 
Bug: 180401296
Merged-In: I26b0f374e227cba084ab4c794253a3d5347be363
Change-Id: I2eee925bb5b7e55544ade75469e3c5865cc4b5e3
 2021-02-20 00:24:33 -08:00
Xin Li 2092fb2dcc Mark ab/6881855 as merged am: 89efbab65d am: 7310312ac1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/13113081

Change-Id: Ib0dea4ed6a0ad62c8039c9b31e92617dc198a2ce
 2020-11-23 22:58:50 +00:00
Xin Li 7310312ac1 Mark ab/6881855 as merged am: 89efbab65d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/13113081

Change-Id: I26b0f374e227cba084ab4c794253a3d5347be363
 2020-11-23 22:31:38 +00:00
Xin Li 89efbab65d Mark ab/6881855 as merged 
Bug: 172690556
Change-Id: Ie831223c0a12c97e651c0742910808e9830efec8
 2020-11-23 11:31:36 -08:00
Xin Li e4698674b5 [automerger skipped] Skip ab/6749736 in stage. am: 79b4382fc3 -s ours am: bf70b46b62 -s ours am: 00c0283147 -s ours 
am skip reason: Change-Id I0a6ebef1ef342258391bddeb34f5cc719ff28449 with SHA-1 6f8bb7e75e is in history

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

Change-Id: I2308cbe7ce8dfa7097e21c1865194ef230ac1659
 2020-10-09 03:37:05 +00:00
Xin Li 00c0283147 [automerger skipped] Skip ab/6749736 in stage. am: 79b4382fc3 -s ours am: bf70b46b62 -s ours 
am skip reason: Change-Id I0a6ebef1ef342258391bddeb34f5cc719ff28449 with SHA-1 6f8bb7e75e is in history

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

Change-Id: I4d81496cf65784cfc19d10ae6b15523ad638a5dd
 2020-10-09 02:58:31 +00:00
Xin Li bf70b46b62 [automerger skipped] Skip ab/6749736 in stage. am: 79b4382fc3 -s ours 
am skip reason: Change-Id I0a6ebef1ef342258391bddeb34f5cc719ff28449 with SHA-1 6f8bb7e75e is in history

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

Change-Id: Ic45124f2d068430b60dec959b719de106b90d4ac
 2020-10-09 02:24:21 +00:00
Xin Li 79b4382fc3 Skip ab/6749736 in stage. 
Merged-In: I0a6ebef1ef342258391bddeb34f5cc719ff28449
Change-Id: I08363195474384d1bc8a5f79b1fb81a724560b67
 2020-10-08 17:22:57 -07:00
Xin Li 638ba35263 [automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours am: ea66406522 -s ours am: c0f9bb1586 -s ours am: fb84346da5 -s ours 
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457

Change-Id: Ie4e5706a73cd044d29c74735c7790f092f5379d1
 2020-09-11 21:27:17 +00:00
Xin Li fb84346da5 [automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours am: ea66406522 -s ours am: c0f9bb1586 -s ours 
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457

Change-Id: Ia1268f61da5e8f42611c6c852526286be5fd7962
 2020-09-11 03:58:48 +00:00
Xin Li c0f9bb1586 [automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours am: ea66406522 -s ours 
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457

Change-Id: I336273f1955b0fef34ce2647888087226c630acd
 2020-09-11 03:33:17 +00:00
Xin Li ea66406522 [automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours 
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457

Change-Id: I4a04fc1f18f6992ef15e6efa2edcfafb38be50f9
 2020-09-11 02:02:25 +00:00
Xin Li d5da09e85f [automerger skipped] Merge Android R am: 1303239498 -s ours 
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457

Change-Id: I121400cb05ba2cb83d368a5ad03120e8f2c22763
 2020-09-11 00:39:45 +00:00
Xin Li 1303239498 Merge Android R 
Bug: 168057903
Merged-In: Ia11f7837439c1b4f12ba51e676952659a5fb542f
Change-Id: Id98fe14ac2bebd36dbdd0f46ef723d9af7e889c4
 2020-09-08 16:56:05 -07:00
Xin Li a27bc5af97 [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours am: 16525d6f36 -s ours am: fe8699e8bf -s ours am: 8fd5c4948a -s ours 
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history

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

Change-Id: I374c704eb51e9feca3f7d661fbe12489f7552bde
 2020-09-02 01:59:12 +00:00
Xin Li 8fd5c4948a [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours am: 16525d6f36 -s ours am: fe8699e8bf -s ours 
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history

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

Change-Id: I5d86e6a1e32bea5915330c0908b0ac3ff322b5d7
 2020-09-01 22:09:45 +00:00
Xin Li fe8699e8bf [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours am: 16525d6f36 -s ours 
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history

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

Change-Id: I94b8d8c86ffa1b18706238e8383a08870d927f4c
 2020-09-01 21:46:29 +00:00
Xin Li 16525d6f36 [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours 
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history

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

Change-Id: I1300b2f8a0e23d18c6076c87596d82dfeda964ce
 2020-09-01 20:36:54 +00:00
Xin Li dd810e2520 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: Ie84f1ff41433b8d07cf1306723e772dd598b3ccf
Change-Id: Ia11f7837439c1b4f12ba51e676952659a5fb542f
 2020-08-27 10:16:52 -07:00
Xin Li 247c3382f1 [automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours am: bfb85db768 -s ours am: 26875643c1 -s ours am: 8f8f706267 -s ours am: e2c71498d1 -s ours 
am skip reason: Change-Id Ic5eb962d272432725f634d485742e025a15b8011 with SHA-1 8fe5feae57 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1409198

Change-Id: Iad6f31c8c1fd0ca27b7eb394ad9198016ba7eeef
 2020-08-26 02:54:21 +00:00
Xin Li e2c71498d1 [automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours am: bfb85db768 -s ours am: 26875643c1 -s ours am: 8f8f706267 -s ours 
am skip reason: Change-Id Ic5eb962d272432725f634d485742e025a15b8011 with SHA-1 8fe5feae57 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1409198

Change-Id: I183efee2fcbdf5db34967eae75a12c56b659a133
 2020-08-26 02:33:10 +00:00
Xin Li 8f8f706267 [automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours am: bfb85db768 -s ours am: 26875643c1 -s ours 
am skip reason: Change-Id Ic5eb962d272432725f634d485742e025a15b8011 with SHA-1 8fe5feae57 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1409198

Change-Id: I08396cb0a360e31ddc11e7df164626f4622918d8
 2020-08-26 02:11:31 +00:00
Xin Li 26875643c1 [automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours am: bfb85db768 -s ours 
am skip reason: Change-Id Ic5eb962d272432725f634d485742e025a15b8011 with SHA-1 8fe5feae57 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1409198

Change-Id: I95ad0e40c35d2279a161e520d504adcf75b6d3d8
 2020-08-26 00:34:35 +00:00
Xin Li bfb85db768 [automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours 
am skip reason: Change-Id Ic5eb962d272432725f634d485742e025a15b8011 with SHA-1 8fe5feae57 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1409198

Change-Id: I0146d96c15587fd08193c8cb5942c76d0d3a1a33
 2020-08-25 05:57:10 +00:00
Xin Li b8b866e236 Merge stage branch to development trunk. 
Bug: 160260413
Merged-In: Ic5eb962d272432725f634d485742e025a15b8011
Change-Id: Ica8ca2884ddb2beb4558e62bc1b5cb640d7e2023
 2020-08-24 22:31:56 +00:00
Xin Li 3b5339efa1 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours am: fffdde5087 -s ours am: 8f571212fa -s ours am: 8cb54ae1f1 -s ours am: 13a6b68aa8 -s ours 
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634

Change-Id: If6d8cfa5a3329f2c110dcdc17cdc299d0c756656
 2020-06-08 17:25:13 +00:00
Xin Li 13a6b68aa8 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours am: fffdde5087 -s ours am: 8f571212fa -s ours am: 8cb54ae1f1 -s ours 
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634

Change-Id: I0bb8e5c145c4cac7fc72384bec31df618cd2622e
 2020-06-08 16:42:09 +00:00
Xin Li 8cb54ae1f1 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours am: fffdde5087 -s ours am: 8f571212fa -s ours 
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634

Change-Id: I03cc090b70a60c424fe148aa3d64e3e30b345f78
 2020-06-08 16:29:26 +00:00
Xin Li 8f571212fa [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours am: fffdde5087 -s ours 
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634

Change-Id: I7119b174b8fa106506e689315e0ccbc71551f266
 2020-06-08 16:08:08 +00:00
Xin Li fffdde5087 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours 
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634

Change-Id: I1c87c70a6e4df7803ca0b8e310c7221fe35b1fbc
 2020-06-08 15:56:53 +00:00
Xin Li c66d3e6e32 Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:24 +00:00
Xin Li 0580b4ade0 Merge QQ3A.200605.002 into master 
Bug: 158095402
Merged-In: Ie293c1c84489e4a1f20972bc056f6d2af67b79b4
Change-Id: If9e62cf4c65cd4d4e029989f23b136c8f5efc7ae
 2020-06-03 10:45:08 -07:00
Xin Li 33aeb03d35 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 85eaa3e1ec -s ours am: 67be3bbf79 am: c95b779f7a am: 1c998c5bd3 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia1fdf90e81e9e696c9e3aa5abb3a2d349b492108
 2020-04-10 04:29:54 +00:00
Xin Li 1c998c5bd3 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 85eaa3e1ec -s ours am: 67be3bbf79 am: c95b779f7a 
Change-Id: I2abe8d47be19b06b1ce2d840c32d19c6024ced94
 2020-04-10 04:05:32 +00:00
Xin Li c95b779f7a [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 85eaa3e1ec -s ours am: 67be3bbf79 
Change-Id: I26441f37fa59432f457f7b7baa41985fbc3080f5
 2020-04-10 03:39:14 +00:00
Xin Li 67be3bbf79 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 85eaa3e1ec -s ours 
am skip reason: subject contains skip directive

Change-Id: I90519048d9c855d8828ac647544d2653d345cbf6
 2020-04-10 03:06:10 +00:00