summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADmastermainXin Li
2024-02-12Migrate Test Targets to New Android Ownership Model am: 7b48f2d949temp_319669529Aditya Choudhary
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
2024-01-17Merge Android 24Q1 Release (ab/11220357)Xin Li
2023-12-11[automerger skipped] Merge "Revert^2 "sunfish: Replace NFC app with NFC apex"...Treehugger Robot
2023-12-11[automerger skipped] Merge "Revert^2 "sunfish(nfc): Modify NFC overlays for N...Treehugger Robot
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 61a7265d39 -s ours am: 2c904e7...Xin Li
2023-12-11Merge "Revert^2 "sunfish: Replace NFC app with NFC apex"" into main am: 8245a...Treehugger Robot
2023-12-11Merge "Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"" into main a...Treehugger Robot
2023-12-11Merge "Revert^2 "sunfish: Replace NFC app with NFC apex"" into main am: 8245a...Treehugger Robot
2023-12-11Merge "Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"" into main a...Treehugger Robot
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 61a7265d39 -s ours am: 2c904e7...Xin Li
2023-12-11Merge "Revert^2 "sunfish: Replace NFC app with NFC apex"" into mainTreehugger Robot
2023-12-11Merge "Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"" into mainTreehugger Robot
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 61a7265d39 -s oursXin Li
2023-12-08Merge Android 14 QPR1Xin Li
2023-12-06Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"Roshan Pius
2023-12-06Revert^2 "sunfish: Replace NFC app with NFC apex"Roshan Pius
2023-12-04Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"Roshan Pius
2023-12-04Revert^2 "sunfish: Replace NFC app with NFC apex"Roshan Pius
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: c6...Treehugger Robot
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: c6...Treehugger Robot
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: c6...Treehugger Robot
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: c6...Treehugger Robot
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: c6...tmp_amf_315507370Treehugger Robot
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: c6...Treehugger Robot
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into mainTreehugger Robot
2023-11-11sunfish: update AIDL IGoogleBattery manifest version to 3Jack Wu
2023-11-10Remove unused Android.mk under device/google/sunfishHerbert Xue
2023-11-08[automerger skipped] Merge changes from topic "nfc_apex_revert" into main am:...Roshan Pius
2023-11-08[automerger skipped] Revert "sunfish(nfc): Modify NFC overlays for NFC apex" ...Roshan Pius
2023-11-08[automerger skipped] Merge changes from topic "nfc_apex_revert" into main am:...Roshan Pius
2023-11-08[automerger skipped] Revert "sunfish(nfc): Modify NFC overlays for NFC apex" ...Roshan Pius
2023-11-08[automerger skipped] Merge changes from topic "nfc_apex_revert" into main am:...Roshan Pius
2023-11-08Revert "sunfish(nfc): Modify NFC overlays for NFC apex" am: 3110a92da8 am: ad...Roshan Pius
2023-11-08Merge changes from topic "nfc_apex_revert" into main am: 3bb396285d am: 44a1c...Roshan Pius
2023-11-08Revert "sunfish(nfc): Modify NFC overlays for NFC apex" am: 3110a92da8 am: b5...Roshan Pius
2023-11-08Merge changes from topic "nfc_apex_revert" into main am: 3bb396285dRoshan Pius
2023-11-08Revert "sunfish(nfc): Modify NFC overlays for NFC apex" am: 3110a92da8Roshan Pius
2023-11-08Merge changes from topic "nfc_apex_revert" into main am: 3bb396285dRoshan Pius
2023-11-08Revert "sunfish(nfc): Modify NFC overlays for NFC apex" am: 3110a92da8Roshan Pius
2023-11-08Merge changes from topic "nfc_apex_revert" into mainRoshan Pius
2023-11-07Revert "sunfish: Replace NFC app with NFC apex"Roshan Pius
2023-11-06Revert "sunfish(nfc): Modify NFC overlays for NFC apex"Roshan Pius
2023-11-06Merge "Revert "sunfish: Replace NFC app with NFC apex"" into mainRoshan Pius
2023-11-04Revert "sunfish(nfc): Modify NFC overlays for NFC apex"Roshan Pius
2023-11-04Revert "sunfish: Replace NFC app with NFC apex"Roshan Pius
2023-10-31[automerger skipped] Fix lunch choices for git_main am: 7bd75e7d4c am: 0e0515...Greg Kaiser
2023-10-31[automerger skipped] Fix lunch choices for git_main am: 7bd75e7d4c am: 0004f8...Greg Kaiser
2023-10-30[automerger skipped] Fix lunch choices for git_main am: 7bd75e7d4c am: 0e0515...Greg Kaiser