summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-09Merge "[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s ours" ↵Automerger Merge Worker
into stage-aosp-master
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s oursXin Li
am skip reason: Merged-In Ia3faefdefc558f005de72bc59260eccbc121674e with SHA-1 dcc6d81c40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2338302 Change-Id: I0b800a17aa8c138de2d8833b0b40c9fbb7760bf4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s oursXin Li
am skip reason: Merged-In Ia3faefdefc558f005de72bc59260eccbc121674e with SHA-1 dcc6d81c40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2338302 Change-Id: If7f9eb6b3e53836cebd567b8f095b6701e3692c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge Android 13 QPR1main-16k-with-phonesXin Li
Bug: 261731544 Merged-In: Ia3faefdefc558f005de72bc59260eccbc121674e Change-Id: Ib0153d5153898def51cd5d2cbae1929de907780d
2022-10-25Fix errorprone warnings that should be errors am: dcc6d81c40 am: 94d4e62f29 ↵Cole Faust
am: 1d0c88da32 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2255374 Change-Id: I5c4933379c179c17b4cb67912ba9b5cf0617a05b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25Fix errorprone warnings that should be errors am: dcc6d81c40 am: 94d4e62f29Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2255374 Change-Id: I6aa0e9266d64304c672f3183d7a49069bdb50d9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25Fix errorprone warnings that should be errors am: dcc6d81c40Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2255374 Change-Id: I240e573b3a36fe7c0b026bb24f63bf4f3d6bb15a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-15Fix errorprone warnings that should be errorsCole Faust
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: Ia3faefdefc558f005de72bc59260eccbc121674e
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
4694b3ee91 -s ours am: 292bac4a1f -s ours am skip reason: Merged-In I6ab1698ebe1150d8a8a226f3982556431216eab2 with SHA-1 a1dfd835f7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/20136833 Change-Id: I0bff7394c9a95d0b08d53e4b4a45c3c4392aef58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
4694b3ee91 -s ours am skip reason: Merged-In I6ab1698ebe1150d8a8a226f3982556431216eab2 with SHA-1 a1dfd835f7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/20136833 Change-Id: Id4c0a82155a385ac469e9153cf396f005621accc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Merge tm-qpr-dev-plus-aosp-without-vendor@9129937Xin Li
Bug: 248070379 Merged-In: I6ab1698ebe1150d8a8a226f3982556431216eab2 Change-Id: Ia7ccff287d214d2272ad1938cb82a4bde771cb0d
2022-08-29Add MODIFY_PHONE_STATE when registering receiver am: 1a3d0d5bb8 am: a2ea19a5abJongduck You
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/19684173 Change-Id: I2fab16e8ff8cb4215c695adc89c16739b2b0ae9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-29Add MODIFY_PHONE_STATE when registering receiver am: 1a3d0d5bb8Jongduck You
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/19684173 Change-Id: I4b434affec254381fca50856756a9a40eb1074af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23Add MODIFY_PHONE_STATE when registering receiverandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseJongduck You
ACTION_TTY_PREFERRED_MODE_CHANGE cannot be converted to a protected-broadcast Prevent RcsService from receving the intent that sent from unpriviledged apps Bug: 235100180 Tests: Check Permission Denial of broadcasted intent Change-Id: I70727da0e2461512100ab9e35e382aff2f7f2de4
2022-08-20Fix array-related errorprone warnings am: a1dfd835f7 am: 42c68e04d0 am: ↵Cole Faust
16d4214d5a am: 98a7c610d3 am: e0955f3e30 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2189018 Change-Id: Id0e01d6b124e0bca04c9d39ef877b7d29039e68a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-20Fix array-related errorprone warnings am: a1dfd835f7 am: 42c68e04d0 am: ↵Cole Faust
16d4214d5a am: 98a7c610d3 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2189018 Change-Id: Idf89e676c8878c2cd3284d3b4d4fdbdf054b09fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-20Fix array-related errorprone warnings am: a1dfd835f7 am: 42c68e04d0 am: ↵Cole Faust
16d4214d5a Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2189018 Change-Id: Ic82dc45ccc904a3fe85e9a8a672bd36df7da3ed6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-20Fix array-related errorprone warnings am: a1dfd835f7 am: 42c68e04d0Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2189018 Change-Id: I094548480ea4109bd6efcdac2056ccee1e37ea51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-20Fix array-related errorprone warnings am: a1dfd835f7Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2189018 Change-Id: I91863518743bbb8b37c9158195dd977f61b0a542 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17Fix array-related errorprone warningsCole Faust
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: I6ab1698ebe1150d8a8a226f3982556431216eab2
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8fd53febf2 -s ours ↵Xin Li
am: b73b360e57 -s ours am: de8728dd6f -s ours am: 491d647d08 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2185752 Change-Id: I53ce1a6a01867a2585afee00c402800f9f8a1123 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8fd53febf2 -s ours ↵Xin Li
am: b73b360e57 -s ours am: de8728dd6f -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2185752 Change-Id: I73780a395a02a1ff177816618684560fbe7794f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8fd53febf2 -s ours ↵Xin Li
am: b73b360e57 -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2185752 Change-Id: Ic241a0b89c1cd93982fbf0fd2528482252b88da4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8fd53febf2 -s oursXin Li
am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2185752 Change-Id: I1e47c2be4aabc0cbf307ff496cfce5c2ee0e18b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15DO NOT MERGE - Merge Android 13Xin Li
Bug: 242648940 Merged-In: I646675a4b0454c6c3038f4cc70b380072e063e7c Change-Id: I1b08ccb1fd30553b440a7b1eac8dbddfebcebdee
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fa2df57533 -s ours am: f7a52142ae -s ours am: 25b7eda5d8 -s ours am: 76bc9a5986 -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/19094242 Change-Id: I36e6e147dfd36dfbab7faee60b95798c42a5772a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fa2df57533 -s ours am: f7a52142ae -s ours am: 25b7eda5d8 -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/19094242 Change-Id: Ibe2bf3bb0dac81e7913bf797cf85545684cb0c1b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fa2df57533 -s ours am: f7a52142ae -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/19094242 Change-Id: Ia36960bd6a091edc025145241e021c62f9933654 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fa2df57533 -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/19094242 Change-Id: I8d8f1b3bf831aa0fb01fc03f48af7041a07ed2aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: I646675a4b0454c6c3038f4cc70b380072e063e7c Change-Id: Ia286a184e79b0a64dd0e23a2acf2c48cd291f44d
2022-05-08Snap for 8554636 from 5b37f3e3c0c8f06725aabef013f2b6b961085d83 to sdk-releaseplatform-tools-33.0.3platform-tools-33.0.2Android Build Coastguard Worker
Change-Id: Ib3e9e3853a5d532ea9dee30aee18b5be5e87ab52
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: c691540b78 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I95bc11da6f4c1d7b369a48803e38c78406c49c70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: e8d9b0f7f1 am: 21c2147254 am: 9882518c60 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I7958c1316dd840f9b62ec5cf8c9b618787bc0df4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 am: 5556257a43 am: b481cbe4d8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I5c1b91f4a710c62fdea9af8d090dbe7a81ee29bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 am: 25bd3b2ba7 am: 01de594b26 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I5f41f89218d05f7dcd0496c21ceda40e778291d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: e8d9b0f7f1 am: 21c2147254 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: Iecdf11f5b57039e5507bad9aaa8fdf09f37f0619 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 am: 5556257a43 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I934a9df7b650643a6a019393272faa6bd4d12c17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: e8d9b0f7f1 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I460203254d553e9fbedfe6859abd90980d7a7568 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 am: 25bd3b2ba7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: Ib41449024bc53321abb3e698caa3c7872ce56f03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I3efabd072539fae5b8177215571c8dc9275b5007 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I42fbed575d4df1153dfb757b0a023deaceefb83e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I67b07c5fb2d8dfc18d9c54c3cfd573ed262c3fc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I010bf0e923ccd83c67775f2dfb1e126f5d3949ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010joonhunshin
the EAB provisioned. am: b46dd4a10c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I2df3d6542361e6a4741fbc1176ca5fbb98751902 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devjoonhunshin
the EAB provisioned. Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if the EAB provisioned. Bug: 229793066 Test: atest ImsService Change-Id: I646675a4b0454c6c3038f4cc70b380072e063e7c
2021-12-16Snap for 8005954 from 670521dcdb9500610e5fdbed7a0b7922ea162737 to sdk-releaseplatform-tools-33.0.1platform-tools-33.0.0platform-tools-32.0.0Android Build Coastguard Worker
Change-Id: Ife4cfd5f7f52ed6bccd602db9e014d4c46cb93eb
2021-10-14Snap for 7821744 from f369d20de18a25b4d6b7d65f811b9dc716ca3363 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I1b083acd07df87436e0d27393a4c86272616e5d1
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵Xin Li
-s ours am: f3167a3421 -s ours am: 670521dcdb -s ours am: 5b37f3e3c0 -s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I999b9c2caa0556eb2ab0703a8376d147d3af33b7
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵Xin Li
-s ours am: f3167a3421 -s ours am: 670521dcdb -s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I1fda8534696dc860031d4fd9a19367c51cfc84d3
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
-s ours am: f3167a3421 -s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I0ab17e95ee081fd19ad768637fcfcef74dab88c3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 01:55:21 +0000