filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,026 Commits 1 Branch 0 Tags
b84d8bddf2caaf8808bde3a59eec226a4d11594f
Commit Graph
1026 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taesu Lee b84d8bddf2 Mark messages as failed if SIM is inactive am: 8c08a3f419 am: 947784d4f3 am: 5b6d2cb110 am: c4339a83a9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1449316

Change-Id: I75c3cb226b5265f685a0aeba416edf88bc8b86ef
 2020-10-07 19:15:33 +00:00
Taesu Lee c4339a83a9 Mark messages as failed if SIM is inactive am: 8c08a3f419 am: 947784d4f3 am: 5b6d2cb110 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1449316

Change-Id: I07d62d0098cf3c1e22f3b8f8c0f5dd9d3cc400e3
 2020-10-07 18:43:09 +00:00
Taesu Lee 5b6d2cb110 Mark messages as failed if SIM is inactive am: 8c08a3f419 am: 947784d4f3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1449316

Change-Id: I2b59d1cc26f6e021ccac3ebac5ee7dbc51261201
 2020-10-07 18:25:04 +00:00
Taesu Lee 947784d4f3 Mark messages as failed if SIM is inactive am: 8c08a3f419 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1449316

Change-Id: I287467e6768f4915706710ab0172455ec6510f8c
 2020-10-07 17:57:01 +00:00
Taesu Lee 8c08a3f419 Mark messages as failed if SIM is inactive 
If a SIM is inactive, Mark messages corresponding to the SIM as failed
instead of updating selfId as default selfId. The failed messages could
be sent through the SIM manually if the SIM is re-activated.

Test: Manual

Change-Id: I1eee7c12aaedebe8aa3e0c41b4b057758a3b17a2
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2020-10-06 12:33:21 +09:00
Taesu Lee bd2a71280d Fix creating a new conversation including own number am: 9c97af9b83 am: e7df722655 am: 71f8b60cdf am: 492f7ee2d1 am: 807d8130e0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818

Change-Id: Iec2bf14cd5aaf73701166721537ca2136a8b0b68
 2020-09-16 23:54:01 +00:00
Taesu Lee 807d8130e0 Fix creating a new conversation including own number am: 9c97af9b83 am: e7df722655 am: 71f8b60cdf am: 492f7ee2d1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818

Change-Id: I66c7f94ca94bf20ac47f0b6c07d61d65fe7aaea4
 2020-09-16 22:59:47 +00:00
Taesu Lee 492f7ee2d1 Fix creating a new conversation including own number am: 9c97af9b83 am: e7df722655 am: 71f8b60cdf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818

Change-Id: Ie2d803c9ed06cc4f404a8b0cc05e44d6905cea73
 2020-09-16 20:41:35 +00:00
Taesu Lee 71f8b60cdf Fix creating a new conversation including own number am: 9c97af9b83 am: e7df722655 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818

Change-Id: Ia88e65e4206eef84961c3d7dee3cda7b0330623f
 2020-09-16 20:26:32 +00:00
Taesu Lee e7df722655 Fix creating a new conversation including own number am: 9c97af9b83 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818

Change-Id: I692d40a9ab2d1f262ed2ad5a12cc47a7cdc46d64
 2020-09-16 19:41:45 +00:00
Taesu Lee 9c97af9b83 Fix creating a new conversation including own number 
If a device own phone number is unknown and there is only a single
address in all TO and CC for incoming MMS, ignore the address as it is
device own phone number.

Test: Manual

Change-Id: I26de39bd3b71d3ad391372f35cfce0bd5c7b66ed
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2020-09-16 15:19:58 +09: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
Raman Tenneti 519e191e27 AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98 am: 8fe5feae57 am: 7c76d237bb am: 6f8bb7e75e am: ad68b658f9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899

Change-Id: I7d50e1f833c87a390462f1197337303c51048914
 2020-07-30 02:38:08 +00:00
Raman Tenneti ad68b658f9 AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98 am: 8fe5feae57 am: 7c76d237bb am: 6f8bb7e75e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899

Change-Id: I9ffd9ca7f3e7b2e26f2d61e8bf03c8ab07be44b8
 2020-07-30 02:17:57 +00:00
Raman Tenneti 6f8bb7e75e AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98 am: 8fe5feae57 am: 7c76d237bb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899

Change-Id: I0a6ebef1ef342258391bddeb34f5cc719ff28449
 2020-07-30 02:02:43 +00:00
Raman Tenneti 7c76d237bb AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98 am: 8fe5feae57 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899

Change-Id: I0951034cee454394dd879e85ef5840efaf2e5215
 2020-07-30 01:41:52 +00:00
Raman Tenneti 8fe5feae57 AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899

Change-Id: Ic5eb962d272432725f634d485742e025a15b8011
 2020-07-30 01:26:06 +00:00
Raman Tenneti 4b52654e98 AOSP/Messaging - Update language to comply with Android's inclusive language guidance. 
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make and make messagingtests
Change-Id: I01c520f1d5e9eab8dbb25b08d133ae34bd301093
 2020-07-29 16:43:46 -07:00
Raman Tenneti 9fdbb16a27 AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9 am: 4c12eb471c am: 0875a1420e am: 4671bcc558 am: 9312ecb299 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: I29f928a256b1b26ab20f6833b98fc46e86e3462d
 2020-07-10 03:50:52 +00:00
Raman Tenneti 9312ecb299 AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9 am: 4c12eb471c am: 0875a1420e am: 4671bcc558 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: I2801bfaba651e69bb6a3034c781d53c784cba2f7
 2020-07-10 03:37:27 +00:00
Raman Tenneti 4671bcc558 AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9 am: 4c12eb471c am: 0875a1420e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: Id69fd14fdd4fbda403978ac7502966fa96f309d0
 2020-07-10 03:25:35 +00:00
Raman Tenneti 0875a1420e AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9 am: 4c12eb471c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: Ie84f1ff41433b8d07cf1306723e772dd598b3ccf
 2020-07-10 03:16:05 +00:00
Raman Tenneti 4c12eb471c AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: I5dad8a738ccecbb85c8788fcd867f7b3631c8deb
 2020-07-10 03:10:09 +00:00
Raman Tenneti b1aa213ce9 AOSP/Messaging - Changes to make unit tests to run and pass. 
+ Added missing androix libraries to LOCAL_STATIC_ANDROID_LIBRARIES.
+ Added keep class statements for androidx and messaging classes.
+ Deleted Assert.isEngBuild call (this package is the last user of that method).
+ Added import statements for androidx classes.

Test: manual - Tested the messaging UI. Ran the following tests on Pixel phone.

$ make -j 40
$ make messagingtests -j
$ find out -name "messaging*.apk" -print -exec ls -l {} \;
-rw-r----- 1 rtenneti primarygroup 733809 Jul  9 17:42 out/target/product/bonito/testcases/messagingtests/arm64/messagingtests.apk
-rw-r----- 1 rtenneti primarygroup 10799132 Jul  9 18:34 out/target/product/bonito/product/app/messaging/messaging.apk

$ adb install -r -d -t  out/target/product/bonito/product/app/messaging/messaging.apk
$ adb install -r -d -t  out/target/product/bonito/testcases/messagingtests/arm64/messagingtests.apk
$ adb shell am instrument -w com.android.messaging.test

com.android.messaging.datamodel.BindingTest:.......
com.android.messaging.datamodel.BitmapPoolTest:....
com.android.messaging.datamodel.ConversationListTest:.
com.android.messaging.datamodel.DataModelTest:...
com.android.messaging.datamodel.FrequentContactsCursorBuilderTest:...
com.android.messaging.datamodel.MemoryCacheManagerTest:.
com.android.messaging.datamodel.ParticipantRefreshTest:..........
com.android.messaging.datamodel.action.ActionServiceSystemTest:.....
com.android.messaging.datamodel.action.ActionServiceTest:..
com.android.messaging.datamodel.action.ActionTest:.....
com.android.messaging.datamodel.action.GetOrCreateConversationActionTest:.
com.android.messaging.datamodel.action.ReadWriteDraftMessageActionTest:......
com.android.messaging.datamodel.data.ConversationMessageDataTest:...
com.android.messaging.datamodel.data.ConversationParticipantsDataTest:.
com.android.messaging.datamodel.media.ImageRequestTest:..
com.android.messaging.datamodel.media.MediaResourceManagerTest:.....
com.android.messaging.ui.CustomHeaderViewPagerTest:.
com.android.messaging.ui.MultiAttachmentLayoutTest:...
com.android.messaging.ui.attachmentchooser.AttachmentChooserFragmentTest:.
com.android.messaging.ui.contact.ContactListItemViewTest:....
com.android.messaging.ui.contact.ContactPickerFragmentTest:......
com.android.messaging.ui.conversation.ComposeMessageViewTest:..
com.android.messaging.ui.conversation.ConversationActivityUiStateTest:....
com.android.messaging.ui.conversation.ConversationFragmentTest:..
com.android.messaging.ui.conversation.ConversationInputManagerTest:.....
com.android.messaging.ui.conversation.ConversationMessageViewTest:...
com.android.messaging.ui.conversationlist.ConversationListFragmentTest:...
com.android.messaging.ui.conversationlist.ConversationListItemViewTest:....
com.android.messaging.ui.mediapicker.AudioRecordViewTest:.
com.android.messaging.ui.mediapicker.CameraManagerTest:......
com.android.messaging.ui.mediapicker.GalleryGridItemViewTest:.....
com.android.messaging.ui.mediapicker.MediaPickerTest:..
com.android.messaging.util.BugleGservicesTest:.
com.android.messaging.util.YouTubeUtilTest:.
Test results for InstrumentationTestRunner=.........................................
.........................................
...............................
Time: 9.903

OK (113 tests)

Change-Id: If8fd8036791027739eb9bbb1d3849a46211a5137
 2020-07-09 18:37:41 -07:00
Treehugger Robot e36e710929 Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd am: d67e1db151 am: 55aa308fcb am: c2c670d15a am: 72c3eae5c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: Idfedc335e98a4b75a1763301ab833748b0d9e3c7
 2020-06-29 17:55:06 +00:00
Treehugger Robot 72c3eae5c8 Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd am: d67e1db151 am: 55aa308fcb am: c2c670d15a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I8a6b0c35ca65aae547c1d6289c313a134c5e30dc
 2020-06-29 17:35:44 +00:00
Treehugger Robot c2c670d15a Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd am: d67e1db151 am: 55aa308fcb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I4a03b98f431b696afacbb842426db3fcf9ed7421
 2020-06-29 17:24:42 +00:00
Treehugger Robot 55aa308fcb Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd am: d67e1db151 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I323966094ad9d4c62f0a744de762dfb25d4c7c09
 2020-06-29 17:02:59 +00:00
Treehugger Robot d67e1db151 Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I3c817f847749649e3540e3827263cc8f7184f2b3
 2020-06-29 16:53:27 +00:00
Treehugger Robot 919cb6afdd Merge "Fix NoSuchMethodError for getTypeInfo()" 2020-06-29 16:40:57 +00:00
Bill Yi f71e9d8569 [automerger skipped] Import translations. DO NOT MERGE am: 8e0d3e91f3 -s ours am: a3c59da09d -s ours am: 9d8f501d45 -s ours am: d9620cc155 -s ours am: 840c4ab627 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I338ab65c2e74bcdf9539384b00cfa130ae2dc8e3
 2020-06-29 16:32:59 +00:00
Bill Yi 840c4ab627 [automerger skipped] Import translations. DO NOT MERGE am: 8e0d3e91f3 -s ours am: a3c59da09d -s ours am: 9d8f501d45 -s ours am: d9620cc155 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddec1cbd4ad1f9b6b7c41420bba5c118b8ba74f5
 2020-06-29 16:21:21 +00:00
Bill Yi d9620cc155 [automerger skipped] Import translations. DO NOT MERGE am: 8e0d3e91f3 -s ours am: a3c59da09d -s ours am: 9d8f501d45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idef9dffb1f089ae74cc46274fd81e5cd9feb5dbd
 2020-06-29 16:09:33 +00:00
Bill Yi 9d8f501d45 [automerger skipped] Import translations. DO NOT MERGE am: 8e0d3e91f3 -s ours am: a3c59da09d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3116a3be591a59ec30711dc3554e62a7745f2928
 2020-06-29 15:54:00 +00:00