filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,196 Commits 1 Branch 0 Tags
79481ab146f666e2bef8ee202899b68cbf7b014c
Commit Graph

1196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
79481ab146 Update DrawableWrapper to DrawableWrapperCompat 
Api changed in aosp/2120177

Bug: 235727273
Test: TAP
Change-Id: I1645dab6000dc760b4de2bb625e0af8df014c8c8
 2022-08-26 20:58:50 +08:00
Cole Faust
7fe5df66c4 Fix array-related errorprone warnings am: 1aba0b0461 am: c1da51c9af am: 5d9a564880 am: 87e54599d3 am: af083023d7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186297

Change-Id: I5b9d248cdfbed8a0a683384d2081e6736dedbafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 20:11:25 +00:00
Cole Faust
af083023d7 Fix array-related errorprone warnings am: 1aba0b0461 am: c1da51c9af am: 5d9a564880 am: 87e54599d3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186297

Change-Id: I31bb5ebc65f6664857fadcaa298963bfc47bd2b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 19:50:28 +00:00
Cole Faust
87e54599d3 Fix array-related errorprone warnings am: 1aba0b0461 am: c1da51c9af am: 5d9a564880 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186297

Change-Id: I712e86ec1b748619457fbabd9edc57518ddf4fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 19:15:13 +00:00
Cole Faust
5d9a564880 Fix array-related errorprone warnings am: 1aba0b0461 am: c1da51c9af 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186297

Change-Id: I3032ac78003108ed396bdfc3e067950b18565bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:41:52 +00:00
Cole Faust
c1da51c9af Fix array-related errorprone warnings am: 1aba0b0461 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2186297

Change-Id: I27efca401b1b6332cc3fcc037a4bd3f6043158a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:15:08 +00:00
Cole Faust
1aba0b0461 Fix array-related errorprone warnings 
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: I8a507da97e99a7e86577fda91960dd477c0a6af4
 2022-08-23 09:56:15 -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
Almaz Mingaleev
3af6742c9e Remove uses of Time. am: 909a0763c6 am: 8edea90f7f am: e565640312 am: 7a0e0b8598 am: 802daa4de5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: I32cffdcdede552710a7b8df4e82c5961ed8f841c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 10:19:39 +00:00
Almaz Mingaleev
802daa4de5 Remove uses of Time. am: 909a0763c6 am: 8edea90f7f am: e565640312 am: 7a0e0b8598 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: If43a2c6fda81d6fd07f4fb4d1210a41ced812325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 09:53:04 +00:00
Almaz Mingaleev
7a0e0b8598 Remove uses of Time. am: 909a0763c6 am: 8edea90f7f am: e565640312 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: Ia4c0e40432cbadc01f791465dd7acbe65bcd0ddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 09:36:27 +00:00
Almaz Mingaleev
e565640312 Remove uses of Time. am: 909a0763c6 am: 8edea90f7f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: I8d49bdabf566dfc1a2a875d68270bc97eed16087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 09:20:23 +00:00
Almaz Mingaleev
8edea90f7f Remove uses of Time. am: 909a0763c6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693

Change-Id: Ifb1497b8c212866284a9c138e58612aa7bde3f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 09:03:17 +00:00
Almaz Mingaleev
909a0763c6 Remove uses of Time. 
android.text.format.Time is deprecated since 2014 and there are
better alternatives.

Bug: 16550209
Test: presubmit
Change-Id: Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97
 2022-07-11 11:10:18 +01: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
Jake Klinker
6c466001b2 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: 53ced613ab am: 3153a43657 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ice55370cf005608a17cf02e75d367c0968df1940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 03:22:17 +00:00
Jake Klinker
ee96617536 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 6d643719c4 am: 24594cbf9d am: 65d9cf0f23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ibb90a3782bdc30f8601d5d6ba566f74ad992e301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 02:48:59 +00:00
Jake Klinker
0c1b3f5c40 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: c51c783a46 am: 4d9ed48155 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I27456044b21ce0ebde3ba4380c8f66117991fd30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 13:03:38 +00:00
Jake Klinker
3153a43657 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: 53ced613ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I449cf1dccdca62bc5451618a66ae43f59c5c7701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:18:08 +00:00
Jake Klinker
65d9cf0f23 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 6d643719c4 am: 24594cbf9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I7a16969994fcd4c17ddaf5ccee7c04b1ee8a5817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:17:24 +00:00
Jake Klinker
4d9ed48155 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: c51c783a46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ic94982da7a74f5b756feb2c9169cf5757e4b8bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:16:59 +00:00
Jake Klinker
c51c783a46 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I10742143b1c7e1f81a4c8f7a25ca1f949889cf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:36:07 +00:00
Jake Klinker
53ced613ab Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I0d6e4bff6d1b3c825a72006768d16697c385271b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:36:03 +00:00
Jake Klinker
24594cbf9d Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 6d643719c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I4aad45472c767c3e9a9869f76e60009a84431707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:35:55 +00:00
Jake Klinker
c5961c337d Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 682ab534f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I0a4645306d5ab011c7b5dd9e84b93de1e8443c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:35:12 +00:00
Jake Klinker
a707a5cd8d Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ic40d53b31defa115d376069d7d873bac70c5d7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:18:26 +00:00
Jake Klinker
682ab534f6 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I963d72306df114e57364b3e3ed3519eab7ace1de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:17:19 +00:00
Jake Klinker
6d643719c4 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Iace24a73bdf3f1ece511f4689198b1e28f4026c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:16:54 +00:00
Jake Klinker
c8e4ab2b22 Fix url:file:// style URIs from not being detected in UriUtil. 
Change-Id: I81c01202306d856f6f8f8b74a5a28d7c1011fcec
Tested: Was no longer able to repro b/222091734.
Bug: 222091734
(cherry picked from commit 2283165c23)
 2022-04-26 16:38:11 +00:00
Jake Klinker
2283165c23 Fix url:file:// style URIs from not being detected in UriUtil. 
Change-Id: I81c01202306d856f6f8f8b74a5a28d7c1011fcec
Tested: Was no longer able to repro b/222091734.
Bug: 222091734
 2022-04-21 18:35:50 +00: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