summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-12Snap for 11206181 from bdb2183763a2ea570bf325efa0eea82569fdb47a to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I5d6685248be94e42900e6e290117e25c86fe3a8e
2023-12-11[automerger skipped] Merge "Revert^2 "sunfish: Replace NFC app with NFC ↵Treehugger Robot
apex"" into main am: 8245ab63b5 am: 23d9fcf9b3 am: 1813a58584 -s ours am skip reason: Merged-In Ib899388df166a2178d0e7c361c945122d5a82841 with SHA-1 1ec0335ffd is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863587 Change-Id: I9241f7ad20e451e859fe29f9b33d400f2117e2ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Revert^2 "sunfish(nfc): Modify NFC overlays for ↵Treehugger Robot
NFC apex"" into main am: 13abc9695d am: 7801f47575 am: f818552201 -s ours am skip reason: Merged-In I9028f8eae1d973d0f9b7553a6adf9525b56766c9 with SHA-1 34acb968a5 is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863088 Change-Id: Id2dedc0d627b894f103c818d12f74a429252fe0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 61a7265d39 -s ours am: ↵Xin Li
2c904e7206 -s ours am: b86d752519 -s ours am skip reason: Merged-In I405116d274cfcba81fa0be1aa330b13bd1bef64d with SHA-1 4f9c0920e5 is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2866414 Change-Id: Iae1e301c85f5a5c62cb38bcde6e107011e1ab014 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "sunfish: Replace NFC app with NFC apex"" into main am: ↵Treehugger Robot
8245ab63b5 am: 23d9fcf9b3 Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863587 Change-Id: I045e2917ffef96b052fb67c06fb57fdc550488c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"" into main ↵Treehugger Robot
am: 13abc9695d am: 7801f47575 Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863088 Change-Id: I2be4ba253d38574ec5824910c3a73f557e6302e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "sunfish: Replace NFC app with NFC apex"" into main am: ↵Treehugger Robot
8245ab63b5 Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863587 Change-Id: Iab4ff24b18973cd8cbdeade47f4273d6cee9bbde Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"" into main ↵Treehugger Robot
am: 13abc9695d Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863088 Change-Id: I9a0c21df4fc6d054ed7a5d7fc29ccb2480508112 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 61a7265d39 -s ours am: ↵Xin Li
2c904e7206 -s ours am skip reason: Merged-In I405116d274cfcba81fa0be1aa330b13bd1bef64d with SHA-1 4f9c0920e5 is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2866414 Change-Id: Ibca993fcf766178f06de53b6a3a5ee55405c35cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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
am skip reason: Merged-In I405116d274cfcba81fa0be1aa330b13bd1bef64d with SHA-1 4f9c0920e5 is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2866414 Change-Id: Ica0023a3fc5ab718c0389788c8ca95c4d4a5bf6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I405116d274cfcba81fa0be1aa330b13bd1bef64d Bug: 315507370 Change-Id: Ie13b9ee1ce67642bf088961f0b0e5367d21e39c5
2023-12-07Snap for 11186783 from 34acb968a58e4aefa003cc00fc20699d6d66a0cd to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I5224a06980e8f3989f57203eb13ec45bd0d67a6f
2023-12-06Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"Roshan Pius
0ba612f27f56cabafb15efb78adfca8e565486a0 Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:34acb968a58e4aefa003cc00fc20699d6d66a0cd) Merged-In: I9028f8eae1d973d0f9b7553a6adf9525b56766c9 Change-Id: I9028f8eae1d973d0f9b7553a6adf9525b56766c9
2023-12-06Revert^2 "sunfish: Replace NFC app with NFC apex"Roshan Pius
ed69a7cc8c2f30a8f375f7fa8c781796e98fb399 Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1ec0335ffd1a01f4f74a74cdc167e4b976d35d71) Merged-In: Ib899388df166a2178d0e7c361c945122d5a82841 Change-Id: Ib899388df166a2178d0e7c361c945122d5a82841
2023-12-04Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"Roshan Pius
0ba612f27f56cabafb15efb78adfca8e565486a0 Bug: 303286040 Test: Compiles Change-Id: I9028f8eae1d973d0f9b7553a6adf9525b56766c9
2023-12-04Revert^2 "sunfish: Replace NFC app with NFC apex"Roshan Pius
ed69a7cc8c2f30a8f375f7fa8c781796e98fb399 Bug: 303286040 Test: Compiles Change-Id: Ib899388df166a2178d0e7c361c945122d5a82841
2023-11-18Snap for 11117647 from ff8952008e2790375cb473332f6501c4c3857264 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I203696a6a7f7066254856e4456e8bba49357eeef
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: ↵Treehugger Robot
c67c23d7ef am: 0c777425e6 am: 19bbb00fba Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754 Change-Id: I06b9bd69b34f65f966b1cf866119aec9e0a4857e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: ↵Treehugger Robot
c67c23d7ef am: 4f9c0920e5 am: 8744bf9f04 Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754 Change-Id: I26d9985515737ceda915f6c46aacf63b35a384ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: ↵Treehugger Robot
c67c23d7ef am: 0c777425e6 Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754 Change-Id: Iee9bdbc60cc559e381b097f1fba1fbb3722f83f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: ↵Treehugger Robot
c67c23d7ef am: 4f9c0920e5 Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754 Change-Id: Ife1530474aba775150d8ab0bcafdc9e1c8a84410 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: ↵tmp_amf_315507370Treehugger Robot
c67c23d7ef Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754 Change-Id: I405116d274cfcba81fa0be1aa330b13bd1bef64d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into main am: ↵Treehugger Robot
c67c23d7ef Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754 Change-Id: I2d5a18693ceaeb64aa7600495b978d052d0a65b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "Remove unused Android.mk under device/google/sunfish" into mainTreehugger Robot
2023-11-14Snap for 11089623 from 341c9c3dde4774783450a915402ad3419bc6e435 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ice176a808ca59da6a35402eaafc55a73b781b1cc
2023-11-11sunfish: update AIDL IGoogleBattery manifest version to 3Jack Wu
Bug: 309518527 Test: TH Change-Id: Ic00cdf376feacfdbc9494c49cd421cd7fd581364 Signed-off-by: Jack Wu <wjack@google.com>
2023-11-10Remove unused Android.mk under device/google/sunfishHerbert Xue
The sunfish device is deprecated. Bug: 310105129 Test: NA Change-Id: I30c40ed83c41aceb2bfbfde5cd1e02e740d79ec1
2023-11-10Snap for 11078623 from 4c70701543d7127962dbe30b98d43b87c1de2ec6 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I946e13885a40de9eeb21d3021e21fec5b3235c1f
2023-11-08[automerger skipped] Merge changes from topic "nfc_apex_revert" into main ↵Roshan Pius
am: 3bb396285d am: f1bb321d99 -s ours am: 648a5fb7be -s ours am skip reason: Merged-In I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9 with SHA-1 743272dd7e is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634 Change-Id: Id1fdf23d2be6588b96b80751dec8957e3ba4e388 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08[automerger skipped] Revert "sunfish(nfc): Modify NFC overlays for NFC apex" ↵Roshan Pius
am: 3110a92da8 am: ad4186371b am: 60bcab5932 -s ours am skip reason: Merged-In Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400 with SHA-1 0ba612f27f is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131 Change-Id: If60b3f30fcf33983893c7fe0f7fb76db31602e88 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08[automerger skipped] Merge changes from topic "nfc_apex_revert" into main ↵Roshan Pius
am: 3bb396285d am: 44a1cb332c am: 50a8795fd5 -s ours am skip reason: Merged-In I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9 with SHA-1 ed69a7cc8c is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634 Change-Id: Icb459820165029dedfe1995c917221acaa6cfbf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08[automerger skipped] Revert "sunfish(nfc): Modify NFC overlays for NFC apex" ↵Roshan Pius
am: 3110a92da8 am: b566fce5ba am: 3dfc560df0 -s ours am skip reason: Merged-In Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400 with SHA-1 0ba612f27f is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131 Change-Id: I6f0d429fd740faf017c4f701ee87397013191f48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08[automerger skipped] Merge changes from topic "nfc_apex_revert" into main ↵Roshan Pius
am: 3bb396285d am: f1bb321d99 -s ours am skip reason: Merged-In I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9 with SHA-1 743272dd7e is already in history Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634 Change-Id: I6088b32e2c659964fcdba629347e342b16924e65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Revert "sunfish(nfc): Modify NFC overlays for NFC apex" am: 3110a92da8 am: ↵Roshan Pius
ad4186371b Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131 Change-Id: Ibbf1fd2c0b31d542dbc01f8811246cb7211a03fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge changes from topic "nfc_apex_revert" into main am: 3bb396285d am: ↵Roshan Pius
44a1cb332c Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634 Change-Id: I540cf027cc06f530d81b1bad7d3a4c9d56430620 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Revert "sunfish(nfc): Modify NFC overlays for NFC apex" am: 3110a92da8 am: ↵Roshan Pius
b566fce5ba Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131 Change-Id: I20906cbd0dc599c8adeaadb237a6182a08d0efc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge changes from topic "nfc_apex_revert" into main am: 3bb396285dRoshan Pius
Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634 Change-Id: I571e1928220b7ec639f691df52d12c61a02655be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Revert "sunfish(nfc): Modify NFC overlays for NFC apex" am: 3110a92da8Roshan Pius
Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131 Change-Id: I3bfee78e653a4e947a3039a7c7fdcc222518cb9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge changes from topic "nfc_apex_revert" into main am: 3bb396285dRoshan Pius
Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2816634 Change-Id: Ibb4a4354735386accf25471bdb4b76ae481f6d8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Revert "sunfish(nfc): Modify NFC overlays for NFC apex" am: 3110a92da8Roshan Pius
Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2818131 Change-Id: I134717ab19ce96f1f482b2c5ba41e791a01286f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge changes from topic "nfc_apex_revert" into mainRoshan Pius
* changes: Revert "sunfish: Replace NFC app with NFC apex" Revert "sunfish(nfc): Modify NFC overlays for NFC apex"
2023-11-07Revert "sunfish: Replace NFC app with NFC apex"Roshan Pius
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056 Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056 Bug: 309117462 Test: Compiles, device boots up (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed69a7cc8c2f30a8f375f7fa8c781796e98fb399) Merged-In: I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9 Change-Id: I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9
2023-11-07Snap for 11059422 from a1013fa9e873e54bfd4a14ff03859a88d0e8a2c5 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I0ac0d4da369a61816f1c0b137cd730251ec4abfd
2023-11-06Revert "sunfish(nfc): Modify NFC overlays for NFC apex"Roshan Pius
Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up Merged-In: Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400 Change-Id: Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400
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
Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up (cherry picked from https://android-review.googlesource.com/q/commit:2be48f06bdcc55d3951cd02c51e004de3b82b566) Merged-In: Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400 Change-Id: Ic8359dc4b4314672e6bbf57d1dddf9fd6f871400
2023-11-04Revert "sunfish: Replace NFC app with NFC apex"Roshan Pius
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056 Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056 Bug: 309117462 Change-Id: I441a632caf11ce05146ff5e0a31f8bdd42c9f5f9 Test: Compiles, device boots up
2023-11-01Snap for 11031655 from 25ed58c6f7488bf8dd105b735507ab87c3d4344c to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Icd485c72bf02631d2ab4b63e7f2256d2e9d7197a
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 15:06:26 +0000