summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: Ia9a37bb64ca08ec17861e63018146a5923ebc55b Change-Id: I1a765a024b57d9dc5a68a168c3de4dcd629f8d1d
2023-05-05Removed obsolete audio_effects.conf dependency am: 2f9fcc4d3cShunkai Yao
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/armv7-a-neon/+/23034270 Change-Id: Ia9a37bb64ca08ec17861e63018146a5923ebc55b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04Removed obsolete audio_effects.conf dependencyandroid14-devShunkai Yao
Bug: 279987639 Test: lunch mini_armv7a_neon-eng; m Change-Id: I397feac5306df2ef102f9974b22d7ab5ed434c5b
2021-03-06Merge "Remove old lint from PRODUCT_PACKAGES" am: 0351c780db am: 7981a8e49e ↵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-u-beta-1-gplandroid-13.0.0_r9android-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_r16android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10aml_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_331131000main-16k-with-phonesmain-16kandroid13-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-releaseandroid13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-releaseaml_tz4_332714010Colin Cross
am: ef49321909 am: dd835701bc Original change: https://android-review.googlesource.com/c/device/generic/armv7-a-neon/+/1620662 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icf4e67db73cbf8fd3c450d78dd26e4f94794a5a7
2021-03-06Merge "Remove old lint from PRODUCT_PACKAGES" am: 0351c780db am: 7981a8e49e ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-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-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Colin Cross
am: ef49321909 Original change: https://android-review.googlesource.com/c/device/generic/armv7-a-neon/+/1620662 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I39ad388199e58882f670d2eb037cfd1345d85b06
2021-03-06Merge "Remove old lint from PRODUCT_PACKAGES" am: 0351c780db am: 7981a8e49eColin Cross
Original change: https://android-review.googlesource.com/c/device/generic/armv7-a-neon/+/1620662 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I33ef3df38fa639d46ce9fd306f9ce82ed7d96a41
2021-03-06Merge "Remove old lint from PRODUCT_PACKAGES" am: 0351c780dbandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Colin Cross
Original change: https://android-review.googlesource.com/c/device/generic/armv7-a-neon/+/1620662 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifeea0aac52048cb5432fc8642afa759c7e7c80b4
2021-03-05Merge "Remove old lint from PRODUCT_PACKAGES"android-s-beta-2android-s-beta-1Colin Cross
2021-03-04Remove old lint from PRODUCT_PACKAGESColin Cross
There was no module named lint, so the entry was ignored. Adding a new host module named lint triggers an error: build/make/core/main.mk:1293: warning: Host modules should be in PRODUCT_HOST_PACKAGES, not PRODUCT_PACKAGES Offending entries: lint Remove the old entry. Test: lunch mini_armv7a_neon-eng && m nothing Change-Id: Ied745a30e7330110fc07bbead02ec306d7056f56
2020-09-13Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: a05a563069Roman Kiryanov
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/armv7-a-neon/+/11493181 Change-Id: Id241f0ab62545ef39087c9f058d392314c12b612
2020-05-18[automerger skipped] Merge "Import goldfish soong namespaces to ↵Treehugger Robot
mini_common.mk" am: 6c45a6eab2 am: d511509153 -s ours am: ebd337c459 -s ours am: 5d7dad5a8e -s ours am: 84192a3830 -s ours am skip reason: Change-Id I58e0b35fd548b42717d333682fb1f5653424777c with SHA-1 31a435732a is in history Change-Id: I9225e72a0a045bc49b6ac234d632ef51e68f6fce
2020-05-18[automerger skipped] Merge "Import goldfish soong namespaces to ↵android-s-preview-1Treehugger Robot
mini_common.mk" am: 6c45a6eab2 am: d511509153 -s ours am: ebd337c459 -s ours am: 5d7dad5a8e -s ours am skip reason: Change-Id I58e0b35fd548b42717d333682fb1f5653424777c with SHA-1 31a435732a is in history Change-Id: Ifc98c4949f26b13e69f92b47e5d4632f0340f89a
2020-05-18[automerger skipped] Merge "Import goldfish soong namespaces to ↵Treehugger Robot
mini_common.mk" am: 6c45a6eab2 am: d511509153 -s ours am: ebd337c459 -s ours am skip reason: Change-Id I58e0b35fd548b42717d333682fb1f5653424777c with SHA-1 31a435732a is in history Change-Id: I3af583b1d89afb3ddece33d852e18e48e0766bf3
2020-05-18[automerger skipped] Merge "Import goldfish soong namespaces to ↵Treehugger Robot
mini_common.mk" am: 6c45a6eab2 am: d511509153 -s ours am skip reason: Change-Id I58e0b35fd548b42717d333682fb1f5653424777c with SHA-1 31a435732a is in history Change-Id: I6f890ee9f1f7d134b89bb34830031720f21825f3
2020-05-18Merge "Import goldfish soong namespaces to mini_common.mk" am: 6c45a6eab2android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I1ef80e9defae8c1b7ec4ef7479c4201fe7ab72b9
2020-05-18Merge "Import goldfish soong namespaces to mini_common.mk"Treehugger Robot
2020-05-18Import goldfish soong namespaces to mini_common.mkRoman Kiryanov
Bug: 154151802 Test: presubmit Signed-off-by: Roman Kiryanov <rkir@google.com> Change-Id: I58e0b35fd548b42717d333682fb1f5653424777c Merged-In: I58e0b35fd548b42717d333682fb1f5653424777c
2020-05-18Merge "Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: ↵Automerger Merge Worker
3dddc2c46e" into rvc-d1-dev-plus-aosp am: 19360d5edd am: 447c91469e Change-Id: Idc9199d22168ffb057f5630db4f12141d7b75109
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: ↵Roman Kiryanov
bb1ac0b977 am: b13c00e79c am: 5cec28ac66 Change-Id: I4d79129f7bba5dca7a31aa7f8776d12f1256dae7
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: ↵Roman Kiryanov
bb1ac0b977 am: 06061d5543 am: 45541a3164 Change-Id: I95be10a41cce8169c114377e626afa222bb553a0
2020-05-18Merge "Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: ↵Automerger Merge Worker
3dddc2c46e" into rvc-d1-dev-plus-aosp am: 19360d5edd Change-Id: Ifea3dc29856804046b844af3bb18f300ed19540d
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: ↵Roman Kiryanov
bb1ac0b977 am: b13c00e79c Change-Id: Id45f8887c33fde1d12eb3208600dd5ef6e426dc2
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: ↵Roman Kiryanov
bb1ac0b977 am: 06061d5543 Change-Id: I0190526ad12f4818600baedfc39548e662b3e053
2020-05-18Merge "Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: ↵Automerger Merge Worker
3dddc2c46e" into rvc-d1-dev-plus-aosp
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: 3dddc2c46eRoman Kiryanov
Change-Id: I9db918e867dd63eb90e47972e4ef6553a83ee5f6
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: bb1ac0b977android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseRoman Kiryanov
Change-Id: I058a0da66a9f4d616ec4b8d8903775c17afbaded
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: bb1ac0b977Roman Kiryanov
Change-Id: I442b6288e56e32a7e86ac0d7da6aa82a0013fe1e
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732aandroid-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100Roman Kiryanov
Change-Id: Ic2105b9e981c54b1bf9dc3b25f6e965b323a141e
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732aRoman Kiryanov
Change-Id: Iac7915b06232d8a2c0f711690b9d569fb1a38237
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732aandroid-11.0.0_r16android11-d1-b-releaseRoman Kiryanov
Change-Id: I5278cd1be63eeb81fd8df82f5ed3e8057cb99188
2020-05-14Import goldfish soong namespaces to mini_common.mkandroid11-devRoman Kiryanov
Bug: 154151802 Test: presubmit Signed-off-by: Roman Kiryanov <rkir@google.com> Change-Id: I58e0b35fd548b42717d333682fb1f5653424777c
2020-05-05Merge "Add METADATA to armv7-a-neon: Apache2=NOTICE" am: d45b410fbb am: ↵Treehugger Robot
e66d7f0898 am: a8f894ea92 am: 658da96fa6 am: 055ee2917e Change-Id: I432082ce126953e92587c57a612bffcee80a2e32
2020-05-05Merge "Add METADATA to armv7-a-neon: Apache2=NOTICE" am: d45b410fbb am: ↵Treehugger Robot
e66d7f0898 am: a8f894ea92 am: 658da96fa6 Change-Id: I76492f83871e76a2d90f2f0b588e75d3a4bc9393
2020-05-05Merge "Add METADATA to armv7-a-neon: Apache2=NOTICE" am: d45b410fbb am: ↵Treehugger Robot
e66d7f0898 am: a8f894ea92 Change-Id: I17e854eac701f5a6002fc38addc1b8d5d43ffd37
2020-05-05Merge "Add METADATA to armv7-a-neon: Apache2=NOTICE" am: d45b410fbb am: ↵Treehugger Robot
e66d7f0898 Change-Id: I5e7a4defa0dfeb248a1622b5ec42fd1e1733b1c3
2020-05-05Merge "Add METADATA to armv7-a-neon: Apache2=NOTICE" am: d45b410fbbTreehugger Robot
Change-Id: I4b834edf74a76d835a27da729faac934a3b892fe
2020-05-05Merge "Add METADATA to armv7-a-neon: Apache2=NOTICE"Treehugger Robot
2020-05-01Add METADATA to armv7-a-neon: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ia0fca0342e43230baf33c6b2cf938b1fb723e7c9
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 90ffc33a7c am: 66a3702708 -s ours am skip reason: subject contains skip directive Change-Id: I5ef9291bd9cc2d33c50e3fac2e8cafb46922de87
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 90ffc33a7c Change-Id: I0d245bf8446a4a3500a98f7d1a8945098527f4ab
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I9c61b926ea2132819e1f07a101e67af9d86eae5d
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: de1b4be0c4 -s ours am: 8081ebca4f -s ours am: accd557c7e -s ours am skip reason: change_id I67e45067cbd831b3a64e6a41b3553de9cbcbc192 with SHA1 a71181c20f is in history Change-Id: I56cf957fba746f72e2d55095f8e92d5cb49f48e7
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: de1b4be0c4 -s ours am: 8081ebca4f -s ours am skip reason: change_id I67e45067cbd831b3a64e6a41b3553de9cbcbc192 with SHA1 a71181c20f is in history Change-Id: I55d1a24f5c8057caf91bba39ba62a1efbb00d540
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: de1b4be0c4 -s ours am skip reason: change_id I67e45067cbd831b3a64e6a41b3553de9cbcbc192 with SHA1 a71181c20f is in history Change-Id: I3a4b943b00edd5279ad844cc950a317b504c23a1
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I6bbad1fb8e66cc2c7a53db7e580799833f2a7bcd Merged-In: I67e45067cbd831b3a64e6a41b3553de9cbcbc192
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
f1f1b0a013 -s ours am: 69c71026da am: f89e11c498 am: 96ff85d158 -s ours am skip reason: subject contains skip directive Change-Id: I41c0de3e09444fddf3d3f6f4cdb06290f7bf6fab
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
f1f1b0a013 -s ours am: 69c71026da am: f89e11c498 Change-Id: I4259052abe2dd0c95e26a1fcee8fc333aac49aa0
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
f1f1b0a013 -s ours am: 69c71026da Change-Id: I5fefac2de08abde75cfb4709ec9e104fb81b1a95
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: f1f1b0a013 -s ours am skip reason: subject contains skip directive Change-Id: Ifbba0f9d672853bb53a5fc4b80b51f01a1be1838
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 13:52:17 +0000