summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-31Merge "Fix licenses and license texts." am: 415b6c98ba am: 7d558418cb am: ↵t_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_331113000aml_sch_331111000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-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-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Treehugger Robot
84277a4f3d am: edf435aef1 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1964782 Change-Id: Ic62dfece8efaf873df4f0265ef82075353b2bfd8
2022-01-31Merge "Fix licenses and license texts." am: 415b6c98ba am: 7d558418cb am: ↵Treehugger Robot
84277a4f3d Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1964782 Change-Id: I291c1e8c6e07ed6cb573d05275b74abd6575f997
2022-01-31Merge "Fix licenses and license texts." am: 415b6c98ba am: 7d558418cbTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1964782 Change-Id: I2b98a5a464f518a0055d10f79d615550e72c7c2f
2022-01-31Merge "Fix licenses and license texts." am: 415b6c98baTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1964782 Change-Id: I0dacd9140981b4aaf570edfc03dff7d65693ed12
2022-01-31Merge "Fix licenses and license texts."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-1Treehugger Robot
2022-01-27Fix licenses and license texts.Bob Badour
Entire project is 1p. Test: m nothing Change-Id: I72b183fc7c8da980d2056bdf84d9425025e6adc5
2021-12-07Add unaudited exported flag to exposed runtime receiversMichael Groover
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 T 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 T release. Bug: 161145287 Test: Build Change-Id: Ie460232456b691fbbb273eda8d7c4d6da7d98384
2021-09-22Handle MediaMetadataRetriever.release IOExceptionSantiago Seifert
MediaMetadataRetriever.release now declares a thrown IOException. Bug: 200173116 Test: Should be a non-functional change (only relevant when using MediaDataSource). Change-Id: I6f517299967ce2c1ab63d22e42bb229a0c2be4a9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 37f9dbad53 -s ↵Xin Li
ours am: 1de8f8ca37 -s ours am: 2593b6fdfd -s ours am skip reason: Change-Id I74f76260be0f78d089380e978c12ca63ebac799f with SHA-1 88de292fce is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8b3ff7de7b1b43efb4074da3a8e623198822cb80
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 37f9dbad53 -s ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-s-v2-preview-1Xin Li
ours am: 1de8f8ca37 -s ours am skip reason: Change-Id I74f76260be0f78d089380e978c12ca63ebac799f with SHA-1 88de292fce is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I707c8790845c4bc24b2e67dc4c5ce90735145880
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 37f9dbad53 -s oursXin Li
am skip reason: Change-Id I74f76260be0f78d089380e978c12ca63ebac799f with SHA-1 88de292fce is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ideab615d8337febe0bdad907ae9bcac6d4489d87
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I74f76260be0f78d089380e978c12ca63ebac799f Change-Id: Ifba634467b8206622448eef9dd37c78e75aee0ed
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCamera" am: ↵Bob Badour
5ef76d204d am: 1068dba4aa am: dd03733224 am: c38085a868 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1576150 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I430633eb16d82f6485239a5d278b60bc5d8b585e
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCamera" am: ↵Bob Badour
5ef76d204d am: 1068dba4aa am: dd03733224 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1576150 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5837ce4ef16f25ddef3d7e83878adf6d54d9eac0
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCamera" am: ↵Bob Badour
5ef76d204d am: 1068dba4aa Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1576150 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica8ae63732620e0454788d3ac231442832b87687
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCamera" am: ↵Bob Badour
5ef76d204d Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1576150 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I34cce8ea5ed17bbc307e1699e17dabb3e7e00b75
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCamera"android-s-preview-1Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCameraBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp jni/Android.bp tests/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I8a100e681b77959099a8a547078f60efd7d32fc9
2020-12-14Merge "Revert^2 "Add <uses-library> information."" am: 88c8330514 am: ↵Diego Vela
37ae78c4ad am: 88de292fce Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1526687 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If450dacef27517aad24217265388790d07b1fd1d
2020-12-14Merge "Revert "Add <uses-library> information."" am: 5d33018c8b am: ↵Diego Vela
3e5432799e am: 590f9e6a27 Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1527777 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I438f24c38d3d5131638db29c8cee92292147383b
2020-12-14Merge "Revert^2 "Add <uses-library> information."" am: 88c8330514 am: 37ae78c4adDiego Vela
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1526687 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I74f76260be0f78d089380e978c12ca63ebac799f
2020-12-14Merge "Revert "Add <uses-library> information."" am: 5d33018c8b am: 3e5432799eDiego Vela
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1527777 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7d32619aeda136f847664ed25be29f82b7f25e3c
2020-12-14Merge "Revert^2 "Add <uses-library> information."" am: 88c8330514Diego Vela
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1526687 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ae2512522a75cb9d8f1c9fa7b20f388761aa7a0
2020-12-14Merge "Revert^2 "Add <uses-library> information.""Diego Vela
2020-12-14Revert^2 "Add <uses-library> information."Diego Vela
5ac66fa4fa3cf4443ba33844cbf85207a4593553 Change-Id: Ia05d219b6ae48ae620ba0ec823918b357efed389
2020-12-14Merge "Revert "Add <uses-library> information."" am: 5d33018c8bDiego Vela
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1527777 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6194bdd41683b92eb0b16c649214cedbc4866340
2020-12-14Merge "Revert "Add <uses-library> information.""Diego Vela
2020-12-14Revert "Add <uses-library> information."Diego Vela
Revert "Add <uses-library> information." Revert "Add <uses-library> information." Revert "Add <uses-library> information." Revert submission 1427961-uses-libs-23 Reason for revert: Broken build Bug: 175607244 Reverted Changes: I6ab699005:Add <uses-library> information. Id5d5fe1df:Add <uses-library> information. Id12741c9b:Add <uses-library> information. I2fe6e09c2:Add <uses-library> information. Change-Id: I94232ba1b12e25557734d43fe80835d955873bc5
2020-12-10Merge "Revert "Add <uses-library> information."" am: 3b9cd1b323 am: ↵Sahana Rao
a12a59223f am: c19903b89a Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1521940 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie23d7ff925be5fbd56f0a2b42585338b610603e6
2020-12-10Merge "Revert "Add <uses-library> information."" am: 3b9cd1b323 am: a12a59223fSahana Rao
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1521940 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5524746acf81cd6b499eaeadf227383c93ec7ed2
2020-12-10Merge "Add <uses-library> information." am: 9b1fe3581c am: 641fcf10d4 am: ↵Ulyana Trafimovich
3cc8e892ed Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1427664 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc343f3766ff2a3fd0d26759bd72883fe8e3dda1
2020-12-10Merge "Revert "Add <uses-library> information."" am: 3b9cd1b323Sahana Rao
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1521940 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1a66f83c0e39ad68e89f23ad3ec2fc6881c63b96
2020-12-10Merge "Add <uses-library> information." am: 9b1fe3581c am: 641fcf10d4Ulyana Trafimovich
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1427664 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I40edaa7540cd75ae86727e56b6248d3933e1eebf
2020-12-10Merge "Revert "Add <uses-library> information.""Sahana Rao
2020-12-10Revert "Add <uses-library> information."Sahana Rao
Reason for revert: b/175286760 Reverted Changes: I6ab699005:Add <uses-library> information. Change-Id: I844cc23b2737787470973056b83fd5df885025ef
2020-12-10Merge "Add <uses-library> information." am: 9b1fe3581cUlyana Trafimovich
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1427664 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I07d076a230ec2a394781a38bed948717cabd9365
2020-12-10Merge "Add <uses-library> information."Ulyana Trafimovich
2020-11-23Mark ab/6881855 as merged am: 776bed5621 am: 97c201f469Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/13112988 Change-Id: I25d482a1f678404c5e6b3bee84e956032a3c5579
2020-11-23Mark ab/6881855 as merged am: 776bed5621Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/13112988 Change-Id: I79844c5979aed7ce058f0e278e17df2544612eb8
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I6130fc7cb13979c684e48de922172f2029b0e104
2020-10-27Add <uses-library> information.Ulya Trafimovich
The optional <uses-library> "com.google.android.media.effects" must be added explicitly to `optional_uses_libs`, because Soong cannot add it automatically to the manifest_fixer (it is not an SDK library dependency and it is optional). Bug: 132357300 Test: lunch cf_x86_phone-userdebug && m Test: m out/soong/.intermediates/packages/apps/LegacyCamera/LegacyCamera/android_common/manifest_check/AndroidManifest.xml Change-Id: I6ab69900592c00a16426223e8f0baaf6eb41e033
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9010bb8d52 -s ours am: ↵Xin Li
ccdcf55b5c -s ours am: 661bae5e13 -s ours am skip reason: Change-Id I1bcbd2ce3cfbe039c06c2d53480bd24150f42ae4 with SHA-1 dd27ddb74b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12797516 Change-Id: I61b80aa45bb334491976b59136ab58bf3556ee12
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9010bb8d52 -s ours am: ↵Xin Li
ccdcf55b5c -s ours am skip reason: Change-Id I1bcbd2ce3cfbe039c06c2d53480bd24150f42ae4 with SHA-1 dd27ddb74b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12797516 Change-Id: I99ba8983fde0ab4d3926f87808e5635fadeed32c
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9010bb8d52 -s oursXin Li
am skip reason: Change-Id I1bcbd2ce3cfbe039c06c2d53480bd24150f42ae4 with SHA-1 dd27ddb74b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12797516 Change-Id: I244192f56173ad53523fb1b452ff2c6c183465da
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I1bcbd2ce3cfbe039c06c2d53480bd24150f42ae4 Change-Id: Iabfcad586803fcc3a9e451fc62c0272cb310bce4
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f914cf01ba -s ours am: 073829dcd1 -s ours am: 7581f9b916 -s ours am: 97505a4e1c -s ours am skip reason: Change-Id Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a with SHA-1 0793b42838 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12469921 Change-Id: Ia38305ee56665dc6f04c0facdb609d4f30447c85
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f914cf01ba -s ours am: 073829dcd1 -s ours am: 7581f9b916 -s ours am skip reason: Change-Id Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a with SHA-1 0793b42838 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12469921 Change-Id: I046a2e7058de88eee79cd81f8952b66f0496ef7d
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f914cf01ba -s ours am: 073829dcd1 -s ours am skip reason: Change-Id Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a with SHA-1 0793b42838 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12469921 Change-Id: I1cc839bc8764630a9fa83adfbfa6979c4d280394
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f914cf01ba -s ours am skip reason: Change-Id Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a with SHA-1 0793b42838 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/12469921 Change-Id: Ie2ce6126a7736f07cd4cef2961c57ec97d70a459
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a Change-Id: Iac3475e1d2188085d6d87412f7b9d1304521f573
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 02:48:14 +0000