summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-12Snap for 11206181 from 34839592b913f4b728b85ef02c275a0a965b53fb 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: I6880d8a1c9cd79ac802518782b1492bc0a99eeff
2023-12-11[automerger skipped] Merge "Revert^2 "coral(nfc): Modify NFC overlays for ↵Treehugger Robot
NFC apex"" into main am: 85c74b672e am: 4b4315b16e am: 3fa4484d18 -s ours am skip reason: Merged-In I80a8529cc2ed8755029471e048acc5cbfc955e56 with SHA-1 b1f3f994e2 is already in history Original change: https://android-review.googlesource.com/c/device/google/coral/+/2863586 Change-Id: I4349ca16fc5820f05e2e28cd5ec8f0768280c9a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Revert^2 "coral: Replace NFC app with NFC apex"" ↵Treehugger Robot
into main am: 849350c3bc am: 4b892929df am: 3a2357684e -s ours am skip reason: Merged-In I4354c059bd1bf945a62c580dc897855b57bc3c55 with SHA-1 c9235a50d0 is already in history Original change: https://android-review.googlesource.com/c/device/google/coral/+/2863585 Change-Id: I0dc22f8180ab33cac788c5f5e1f726f6ebc5ac74 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 503afdfba4 -s ours am: ↵Xin Li
d3fccc585b -s ours am: 2cbf85dcb8 -s ours am skip reason: Merged-In Ic8a14d627883698b4d5b9f9ed378f4d462daf599 with SHA-1 9c603f622b is already in history Original change: https://android-review.googlesource.com/c/device/google/coral/+/2866360 Change-Id: I593c306a27fa4239d27055c2983cebb076865653 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "coral(nfc): Modify NFC overlays for NFC apex"" into main ↵Treehugger Robot
am: 85c74b672e am: 4b4315b16e Original change: https://android-review.googlesource.com/c/device/google/coral/+/2863586 Change-Id: Id0b65e8e00cdcb868352bb8d2a790473c3563cc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "coral: Replace NFC app with NFC apex"" into main am: ↵Treehugger Robot
849350c3bc am: 4b892929df Original change: https://android-review.googlesource.com/c/device/google/coral/+/2863585 Change-Id: Ied43d05685f779bb48ffd5169bf226b0107147e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "coral(nfc): Modify NFC overlays for NFC apex"" into main ↵Treehugger Robot
am: 85c74b672e Original change: https://android-review.googlesource.com/c/device/google/coral/+/2863586 Change-Id: Id87c403afbda3d892a63a69bd99b6983d3fcd8dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "coral: Replace NFC app with NFC apex"" into main am: 849350c3bcTreehugger Robot
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2863585 Change-Id: I126dbb27721bcb71f8959d4566567bdd594790ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 503afdfba4 -s ours am: ↵Xin Li
d3fccc585b -s ours am skip reason: Merged-In Ic8a14d627883698b4d5b9f9ed378f4d462daf599 with SHA-1 9c603f622b is already in history Original change: https://android-review.googlesource.com/c/device/google/coral/+/2866360 Change-Id: I921ca7e81b0c03a104bb1af141a561f01c8e411f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "coral(nfc): Modify NFC overlays for NFC apex"" into mainTreehugger Robot
2023-12-11Merge "Revert^2 "coral: Replace NFC app with NFC apex"" into mainTreehugger Robot
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 503afdfba4 -s oursXin Li
am skip reason: Merged-In Ic8a14d627883698b4d5b9f9ed378f4d462daf599 with SHA-1 9c603f622b is already in history Original change: https://android-review.googlesource.com/c/device/google/coral/+/2866360 Change-Id: I680fee7b0093d4a701553c925602103afae68287 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: Ic8a14d627883698b4d5b9f9ed378f4d462daf599 Bug: 315507370 Change-Id: Ibed7e179a588fc1167a3c6eaaf1e13120d0cd94a
2023-12-07Snap for 11186783 from b1f3f994e253788582b7d5b48b9fbd8294e62480 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: If1d8ecbc6500a63b7da0c8ed7fd37a2bddb4d775
2023-12-06Revert^2 "coral(nfc): Modify NFC overlays for NFC apex"Roshan Pius
6b92e954f075ec22e678cda5e655a7f77daa8eb4 Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1f3f994e253788582b7d5b48b9fbd8294e62480) Merged-In: I80a8529cc2ed8755029471e048acc5cbfc955e56 Change-Id: I80a8529cc2ed8755029471e048acc5cbfc955e56
2023-12-06Revert^2 "coral: Replace NFC app with NFC apex"Roshan Pius
2c5e9cd2569af264f59bec8354e1ec20636871bb Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c9235a50d0a270c136883a7d7409710bf5dfae31) Merged-In: I4354c059bd1bf945a62c580dc897855b57bc3c55 Change-Id: I4354c059bd1bf945a62c580dc897855b57bc3c55
2023-12-05Revert^2 "coral(nfc): Modify NFC overlays for NFC apex"Roshan Pius
6b92e954f075ec22e678cda5e655a7f77daa8eb4 Bug: 303286040 Test: Compiles Change-Id: I80a8529cc2ed8755029471e048acc5cbfc955e56
2023-12-05Revert^2 "coral: Replace NFC app with NFC apex"Roshan Pius
2c5e9cd2569af264f59bec8354e1ec20636871bb Bug: 303286040 Test: Compiles Change-Id: I4354c059bd1bf945a62c580dc897855b57bc3c55
2023-11-22Snap for 11130229 from 9a6d905b2cf29c21bfe0c27b430f84684f92747c to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I600ddc9fdf84047b5a47be40f7838d706c7aa92c
2023-11-21Merge "Remove unused Android.mk under device/google/coral am: c95b886595 am: ↵Treehugger Robot
9c603f622b" into udc-qpr-dev-plus-aosp am: afc5fbce87 Original change: https://android-review.googlesource.com/c/device/google/coral/+/2836275 Change-Id: Ida14652c43a5da23461c1c143f3b8e4bfd60a861 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21Merge "Remove unused Android.mk under device/google/coral am: c95b886595 am: ↵Treehugger Robot
9c603f622b" into udc-qpr-dev-plus-aosp
2023-11-21Remove unused Android.mk under device/google/coral am: c95b886595 am: ↵Herbert Xue
6a4f086423 am: 62873d2490 Original change: https://android-review.googlesource.com/c/device/google/coral/+/2836275 Change-Id: I88ba4524995d770ca2c82e2ca25e09defe83bb19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21Remove unused Android.mk under device/google/coral am: c95b886595 am: 6a4f086423Herbert Xue
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2836275 Change-Id: Ib55863aaa91c4fbfea49075002e030c6760449cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Remove unused Android.mk under device/google/coral am: c95b886595 am: 9c603f622bHerbert Xue
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2836275 Change-Id: I282a16aba8171836f20d6ff134c15f9556125a37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Remove unused Android.mk under device/google/coral am: c95b886595Herbert Xue
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2836275 Change-Id: I37dc08c085cf512573d57935c93903d4f721768b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Remove unused Android.mk under device/google/coral am: c95b886595tmp_amf_315507370Herbert Xue
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2836275 Change-Id: Ic8a14d627883698b4d5b9f9ed378f4d462daf599 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Remove unused Android.mk under device/google/coralHerbert Xue
Bug: 311512631 Test: NA Change-Id: I60cda6b26822f815873e2db7f4079019c41d0dca
2023-11-14Snap for 11089623 from 66abf7b6a91847e447a62156b84a21271717ef7c to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Iae9dc53e41ec6e0f12535410cb65b503b6d27528
2023-11-11coral: update AIDL IGoogleBattery manifest version to 3Jack Wu
Bug: 309518527 Test: TH Change-Id: I956a33c52cbcb2ebba3d8026eabea5415213908e Signed-off-by: Jack Wu <wjack@google.com>
2023-11-10Snap for 11078623 from a3ec832704fa2c5ea375cb61c59d45a8339f7a48 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ib7a6689fe5fff0695cdde0bf23d939d5a3bd6e60
2023-11-08[automerger skipped] Merge "Revert "coral(nfc): Modify NFC overlays for NFC ↵Roshan Pius
apex"" into main am: 6ed619fb2c am: 1bb5db1a3a -s ours am: a7f293d6dd -s ours am skip reason: Merged-In I482f23274fd752d196e76568c12b5d6eb5d5212e with SHA-1 9bfb655489 is already in history Original change: https://android-review.googlesource.com/c/device/google/coral/+/2818123 Change-Id: I3948ac97053a37eca3b40b11c5b089df3f866bca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08[automerger skipped] Revert "coral: Replace NFC app with NFC apex" am: ↵Roshan Pius
4abdeaac86 am: 56e8ad4897 am: 17264fb1ab -s ours am skip reason: Merged-In I5e3acc936f2ea4dcaeb8fac247b86caa4e0a31e2 with SHA-1 2c5e9cd256 is already in history Original change: https://android-review.googlesource.com/c/device/google/coral/+/2817035 Change-Id: Ic02db6a604df125468ffceaaf4fc20593df11cf3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08[automerger skipped] Merge "Revert "coral(nfc): Modify NFC overlays for NFC ↵Roshan Pius
apex"" into main am: 6ed619fb2c am: 175bbbee04 am: e0994bf7d7 -s ours am skip reason: Merged-In I482f23274fd752d196e76568c12b5d6eb5d5212e with SHA-1 6b92e954f0 is already in history Original change: https://android-review.googlesource.com/c/device/google/coral/+/2818123 Change-Id: I915d33f4d4927554f7abf6973a3ba19b092ebd05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08[automerger skipped] Revert "coral: Replace NFC app with NFC apex" am: ↵Roshan Pius
4abdeaac86 am: 7b01a97aa2 am: 578e4e035a -s ours am skip reason: Merged-In I5e3acc936f2ea4dcaeb8fac247b86caa4e0a31e2 with SHA-1 2c5e9cd256 is already in history Original change: https://android-review.googlesource.com/c/device/google/coral/+/2817035 Change-Id: I721a668834a99cde2212c3690c7fb3fad5dd4c74 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08[automerger skipped] Merge "Revert "coral(nfc): Modify NFC overlays for NFC ↵Roshan Pius
apex"" into main am: 6ed619fb2c am: 1bb5db1a3a -s ours am skip reason: Merged-In I482f23274fd752d196e76568c12b5d6eb5d5212e with SHA-1 9bfb655489 is already in history Original change: https://android-review.googlesource.com/c/device/google/coral/+/2818123 Change-Id: Ie2289139376c852de4e20692770239a6d796d830 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Revert "coral: Replace NFC app with NFC apex" am: 4abdeaac86 am: 56e8ad4897Roshan Pius
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2817035 Change-Id: Ie71b6ef3a4a8aeb6253fb881c26e312e4e8e1e5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Revert "coral(nfc): Modify NFC overlays for NFC apex"" into main am: ↵Roshan Pius
6ed619fb2c am: 175bbbee04 Original change: https://android-review.googlesource.com/c/device/google/coral/+/2818123 Change-Id: I9d922163858e4ce68a5a4ce7c36a54a13956c5e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Revert "coral: Replace NFC app with NFC apex" am: 4abdeaac86 am: 7b01a97aa2Roshan Pius
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2817035 Change-Id: Icdc59815595a2ebdefa05dddcb972c92c468e5fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Revert "coral(nfc): Modify NFC overlays for NFC apex"" into main am: ↵Roshan Pius
6ed619fb2c Original change: https://android-review.googlesource.com/c/device/google/coral/+/2818123 Change-Id: I84172c6f142cf8aa683d64e3c6d15445b567fbe5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Revert "coral: Replace NFC app with NFC apex" am: 4abdeaac86Roshan Pius
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2817035 Change-Id: I975454069257af51874d74b371ff6b747731e91d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Revert "coral(nfc): Modify NFC overlays for NFC apex"" into main am: ↵Roshan Pius
6ed619fb2c Original change: https://android-review.googlesource.com/c/device/google/coral/+/2818123 Change-Id: I9014bc7af0a28f8057bd958e9d368203343cfed6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Revert "coral: Replace NFC app with NFC apex" am: 4abdeaac86Roshan Pius
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2817035 Change-Id: Iabbe7d10893747b30c04a364d71538d4b5531b41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Revert "coral(nfc): Modify NFC overlays for NFC apex"" into mainRoshan Pius
2023-11-07Snap for 11059422 from 863962a973f78b6c8172a5689f9cd707bcbc7b94 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I917b343cbd279b3dd31f1b5a1bca175134e6b831
2023-11-06Revert "coral(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: I482f23274fd752d196e76568c12b5d6eb5d5212e Change-Id: I482f23274fd752d196e76568c12b5d6eb5d5212e
2023-11-06Revert "coral: 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:2c5e9cd2569af264f59bec8354e1ec20636871bb) Merged-In: I5e3acc936f2ea4dcaeb8fac247b86caa4e0a31e2 Change-Id: I5e3acc936f2ea4dcaeb8fac247b86caa4e0a31e2
2023-11-06Merge "Revert "coral: Replace NFC app with NFC apex"" into mainRoshan Pius
2023-11-04Revert "coral(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:b083fa6ba5e597f64224232330b76ad8b21e68c7) Merged-In: I482f23274fd752d196e76568c12b5d6eb5d5212e Change-Id: I482f23274fd752d196e76568c12b5d6eb5d5212e
2023-11-04Revert "coral: 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: I5e3acc936f2ea4dcaeb8fac247b86caa4e0a31e2 Test: Compiles, device boots up
2023-11-01Snap for 11031655 from 18741f2f5753409f2b19610edd495fbbe7a7ef94 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I91cb0423888a4268f8272bfa8e36d549411dd683
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 02:20:59 +0000