aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADmastermainXin Li
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: fb178f802f -s ours am: edda0dc...Xin Li
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: fb178f802f -s ours am: edda0dc...Xin Li
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: fb178f802f -s oursXin Li
2023-12-08Merge Android 14 QPR1Xin Li
2023-10-19[automerger skipped] Merge 10952656 am: f8d77bb18b -s ours am: 58394e0c7e -s ...Xin Li
2023-10-19[automerger skipped] Merge 10952656 am: f8d77bb18b -s oursXin Li
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
2023-10-07[automerger skipped] Merge Android 14 am: 945cfe3a31 -s ours am: 405126fbc9 -...Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: 945cfe3a31 -s ours am: 405126fbc9 -...Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: 945cfe3a31 -s ours am: 405126fbc9 -...Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: 945cfe3a31 -s ours am: 405126fbc9 -...Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: 945cfe3a31 -s oursXin Li
2023-10-05Merge Android 14Xin Li
2023-09-05[automerger skipped] Merge UP1A.230905.019 am: dd0ce9c8a2 -s ours am: ab7970c...Xin Li
2023-09-05[automerger skipped] Merge UP1A.230905.019 am: dd0ce9c8a2 -s ours am: ab7970c...Xin Li
2023-09-05[automerger skipped] Merge UP1A.230905.019 am: dd0ce9c8a2 -s ours am: ab7970c...Xin Li
2023-09-05[automerger skipped] Merge UP1A.230905.019 am: dd0ce9c8a2 -s oursXin Li
2023-08-31Merge UP1A.230905.019tmp_amf_298295554Xin Li
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 78e72e6980 -s ours am:...Xin Li
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 78e72e6980 -s ours am:...Xin Li
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 78e72e6980 -s ours am:...Xin Li
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 78e72e6980 -s oursXin Li
2023-08-14Merge Android U (ab/10368041)Xin Li
2023-07-27[automerger skipped] [conflict] Merge remote-tracking branch 'goog/main' into...Jörg Wagner
2023-07-27[automerger skipped] Compile ArmNN shim over the support library am: cdf7e04e...Renato Grottesi
2023-07-27[automerger skipped] [conflict] Merge remote-tracking branch 'goog/main' into...Jörg Wagner
2023-07-27[automerger skipped] Compile ArmNN shim over the support library am: cdf7e04e...Renato Grottesi
2023-07-26[conflict] Merge remote-tracking branch 'goog/main' into udc_d1 am: b0ff36ab8dJörg Wagner
2023-07-26[automerger skipped] Compile ArmNN shim over the support library am: cdf7e04e...Renato Grottesi
2023-07-25[automerger skipped] [conflict] Merge remote-tracking branch 'goog/main' into...Renato Grottesi
2023-07-25[automerger skipped] Compile ArmNN shim over the support library am: cdf7e04e...Renato Grottesi
2023-07-24[conflict] Merge remote-tracking branch 'goog/main' into udc_d1 am: b0ff36ab8...Renato Grottesi
2023-07-20[automerger skipped] Compile ArmNN shim over the support library am: cdf7e04e...Renato Grottesi
2023-07-20Merge remote-tracking branch 'goog/main' into udc_d1 am: b0ff36ab8dRenato Grottesi
2023-07-20Compile ArmNN shim over the support library am: cdf7e04e3bRenato Grottesi
2023-07-18Merge cherrypicks of ['googleplex-android-review.googlesource.com/23785405', ...android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-releaseAndroid Build Coastguard Worker
2023-07-18android-nn-driver: avoid hardcoding specificity arrayGuus Sliepen
2023-07-18android-nn-driver: prevent out of bounds readGuus Sliepen
2023-07-14Merge remote-tracking branch 'goog/main' into udc_d1Renato Grottesi
2023-07-14[automerger skipped] DO NOT MERGE : Revert^2 "Compile ArmNN shim over the sup...Renato Grottesi
2023-07-14[automerger skipped] DO NOT MERGE : Revert^2 "Compile ArmNN shim over the sup...Renato Grottesi
2023-07-14[automerger skipped] DO NOT MERGE : Revert^2 "Compile ArmNN shim over the sup...Renato Grottesi
2023-07-14Compile ArmNN shim over the support libraryRenato Grottesi
2023-07-14[automerger skipped] DO NOT MERGE : Revert^2 "Compile ArmNN shim over the sup...Renato Grottesi
2023-07-14DO NOT MERGE : Revert^2 "Compile ArmNN shim over the support library" am: 4ab...Renato Grottesi
2023-07-14DO NOT MERGE : Revert^2 "Compile ArmNN shim over the support library"Renato Grottesi
2023-07-13Merge "Revert^4 "Compile ArmNN shim over the support library"" into mainRenato Grottesi
2023-07-13Revert^4 "Compile ArmNN shim over the support library"Renato Grottesi