filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,229 Commits 1 Branch 0 Tags
de669852b75116ec0e5e778a5d23e878795aefbd
Commit Graph
1229 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Amith Dsouza ec2af4c798 Add README am: 3aeba4cab6 am: 591bf2432c am: f9cd093ca0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2614297

Change-Id: I14048e3a7575f49da4cc945f32d2df839a4f0a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:37:33 +00:00
Amith Dsouza f9cd093ca0 Add README am: 3aeba4cab6 am: 591bf2432c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2614297

Change-Id: I6fa9f9f108e9af79cadd6679b1e2c12d0cb6df19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 17:52:43 +00:00
Amith Dsouza 591bf2432c Add README am: 3aeba4cab6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2614297

Change-Id: Ic8def036efb311ef3cc7f1e25a68c4b3ce211efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 16:46:36 +00:00
Amith Dsouza 3aeba4cab6 Add README 
With details about the status of support for this app

Bug: 280583057
Change-Id: Ib6aea146a33329d3f6c1e375e99f600699318ce4
 2023-06-05 04:56:02 +00:00
Jake Klinker 9c5e64bc74 Trim recipient addresses that are unreasonably long. am: e37bb58fbb am: 268ca205f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23181897

Change-Id: I71e159d33ced2308c1abec806e07105954c2b83e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 22:30:31 +00:00
Jake Klinker 268ca205f3 Trim recipient addresses that are unreasonably long. am: e37bb58fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23181897

Change-Id: I7d829d57ec9a8c9681a4cbb9548255f0f19b4e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 21:49:28 +00:00
Presubmit Automerger Backend dd2620769f [automerge] Trim recipient addresses that are unreasonably long. 2p: e37bb58fbb 2p: 22ba5f1d3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23181897

Bug: 278556945
Change-Id: Icaf4e03f5e9ecf4380f8adb902388e53e6c1ee9e
 2023-05-11 21:59:42 +00:00
Presubmit Automerger Backend 22ba5f1d3d [automerge] Trim recipient addresses that are unreasonably long. 2p: e37bb58fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23181897

Bug: 278556945
Change-Id: Iea18a6475bc3157bcfe8a0cae05f7357e5003acd
 2023-05-11 21:59:33 +00:00
Jake Klinker e37bb58fbb Trim recipient addresses that are unreasonably long. 
This ensures that bad input does not affect the db - the fallback is a reasonable one where we just launch the new conversation screen and have the user select the recipient.

TESTED=manually confirmed that I could no longer repro b/278556945 after this change.
BUG=278556945

Change-Id: I705a304a92cb46b20d916c6f5c2db81e6fa84f06
 2023-05-11 21:59:23 +00:00
Jake Klinker a4838ac96e Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: I070d32b4f371b0b3d62a3352bcff495fb1c4e02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 01:08:02 +00:00
Jake Klinker f5c73b1923 Fix exposing private messages files through attachments with a content URI. am: 0d5452146c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: I56f3015298ed0b2acde72442b458e0b354f0e13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:27:51 +00:00
Presubmit Automerger Backend 749732f47b [automerge] Fix exposing private messages files through attachments with a content URI. 2p: 0d5452146c 2p: 471c3e9320 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Bug: 275552292
Change-Id: I48af374ac45d21758789153013278d68290ee701
 2023-05-09 14:00:58 +00:00
Presubmit Automerger Backend 471c3e9320 [automerge] Fix exposing private messages files through attachments with a content URI. 2p: 0d5452146c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Bug: 275552292
Change-Id: I70bfdb81846c81cf0c79d9a1f33140e00734f163
 2023-05-09 14:00:52 +00:00
Jake Klinker 0d5452146c Fix exposing private messages files through attachments with a content URI. 
Change-Id: I30b2a06c67af4a347d03c7504d13b9b9365acafd
Tested: Was no longer able to repro b/275552292.
Bug: 275552292
 2023-05-09 14:00:39 +00:00
TreeHugger Robot 6ac4faba39 Merge "Add unaudited exported flag to exposed runtime receivers" 2022-11-04 13:03:45 +00:00
Cole Faust ab7151ec62 Fix errorprone warnings that should be errors am: 50b73ca58a am: f812cb353b am: 9000f7ab0b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2255931

Change-Id: I824fc3032b18d2dd5484ef1c1ffce877f274f7e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 03:21:20 +00:00
Cole Faust 9000f7ab0b Fix errorprone warnings that should be errors am: 50b73ca58a am: f812cb353b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2255931

Change-Id: Id8f5515bcdc63cc1f354d468eb4bcd9ca9fed515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 01:32:48 +00:00
Cole Faust f812cb353b Fix errorprone warnings that should be errors am: 50b73ca58a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2255931

Change-Id: Ic88f3392fb80e1d1377c9442f1da817bc0444192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 01:05:07 +00:00
Cole Faust 50b73ca58a Fix errorprone warnings that should be errors 
This commit is part of a large scale change to fix errorprone
errors that have been downgraded to warnings in the android
source tree, so that they can be promoted to errors again.
The full list of changes include the following, but not all
will be present in any one individual commit:

BadAnnotationImplementation
BadShiftAmount
BanJNDI
BoxedPrimitiveEquality
ComparableType
ComplexBooleanConstant
CollectionToArraySafeParameter
ConditionalExpressionNumericPromotion
DangerousLiteralNull
DoubleBraceInitialization
DurationFrom
DurationTemporalUnit
EmptyTopLevelDeclaration
EqualsNull
EqualsReference
FormatString
FromTemporalAccessor
GetClassOnAnnotation
GetClassOnClass
HashtableContains
IdentityBinaryExpression
IdentityHashMapBoxing
InstantTemporalUnit
InvalidTimeZoneID
InvalidZoneId
IsInstanceIncompatibleType
JUnitParameterMethodNotFound
LockOnBoxedPrimitive
MathRoundIntLong
MislabeledAndroidString
MisusedDayOfYear
MissingSuperCall
MisusedWeekYear
ModifyingCollectionWithItself
NoCanIgnoreReturnValueOnClasses
NonRuntimeAnnotation
NullableOnContainingClass
NullTernary
OverridesJavaxInjectableMethod
ParcelableCreator
PeriodFrom
PreconditionsInvalidPlaceholder
ProtoBuilderReturnValueIgnored
ProtoFieldNullComparison
RandomModInteger
RectIntersectReturnValueIgnored
ReturnValueIgnored
SelfAssignment
SelfComparison
SelfEquals
SizeGreaterThanOrEqualsZero
StringBuilderInitWithChar
TreeToString
TryFailThrowable
UnnecessaryCheckNotNull
UnusedCollectionModifiedInPlace
XorPower

See https://errorprone.info/bugpatterns for more
information on the checks.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I8b1533cbea835343dcf589cbaa57c63794be58bd
 2022-10-15 21:33:28 -07:00
Michael Groover 4b17ed7f80 Add unaudited exported flag to exposed runtime receivers 
Android T allows apps to declare a runtime receiver as not exported
by invoking registerReceiver with a new RECEIVER_NOT_EXPORTED flag;
receivers registered with this flag will only receive broadcasts from
the platform and the app itself. However to ensure developers can
properly protect their receivers, all apps targeting U or later
registering a receiver for non-system broadcasts must specify either
the exported or not exported flag when invoking #registerReceiver;
if one of these flags is not provided, the platform will throw a
SecurityException. This commit updates all the exposed receivers
with a new RECEIVER_EXPORTED_UNAUDITED flag to maintain the existing
behavior of exporting the receiver while also flagging the receiver
for audit before the U release.

Bug: 234659204
Test: Build
Change-Id: I15aba10fe12dfcd2e67330ca844491341ef6d920
 2022-10-04 17:18:17 -05:00
Chaohui Wang 077852abdd Update DrawableWrapper to DrawableWrapperCompat am: b1401d612f am: 9cd6eea905 am: 164064c1c4 am: 8817e83c92 am: 1b37d166b3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2200597

Change-Id: Id0e8d9b98533b82298bb6292d5cce20fca0f57cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 22:11:01 +00:00
Chaohui Wang 1b37d166b3 Update DrawableWrapper to DrawableWrapperCompat am: b1401d612f am: 9cd6eea905 am: 164064c1c4 am: 8817e83c92 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2200597

Change-Id: Ibcd5ae8095177b970c6163f25134e3ce2e35ed82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:41:54 +00:00
Chaohui Wang 8817e83c92 Update DrawableWrapper to DrawableWrapperCompat am: b1401d612f am: 9cd6eea905 am: 164064c1c4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2200597

Change-Id: I06cf3ed171327507e082b6aebe6ffe31bceccdaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:14:25 +00:00
Chaohui Wang 164064c1c4 Update DrawableWrapper to DrawableWrapperCompat am: b1401d612f am: 9cd6eea905 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2200597

Change-Id: I29f2e356092269d6d8fe528be00781e0c0864fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 20:16:29 +00:00
Chaohui Wang 9cd6eea905 Update DrawableWrapper to DrawableWrapperCompat am: b1401d612f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2200597

Change-Id: I7304dcfeefa72e267029d712fb80abb995f16e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 19:44:43 +00:00
Chaohui Wang bfb5bb2071 Update DrawableWrapper to DrawableWrapperCompat am: f648675fab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/19946229

Change-Id: Ibdb65ea61d3d4c58143d6fef8441189dbad58ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 18:40:29 +00:00
Chaohui Wang f648675fab Update DrawableWrapper to DrawableWrapperCompat 
Api changed in aosp/2120177

Bug: 235727273
Test: TAP
Change-Id: I1645dab6000dc760b4de2bb625e0af8df014c8c8
 2022-09-15 02:21:58 +00:00
Chaohui Wang b1401d612f Update DrawableWrapper to DrawableWrapperCompat 
Api changed in aosp/2120177

Bug: 235727273
Test: TAP
Change-Id: I1645dab6000dc760b4de2bb625e0af8df014c8c8
 2022-08-31 05:05:10 +00:00
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