summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-30Fix lunch choices for git_main am: 95edaa292eGreg Kaiser
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2811313 Change-Id: Ib8c4ca14a2b1854895fc7543a3ddd656097a6552 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Fix lunch choices for git_mainGreg Kaiser
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1b54ce4db1a3c3ba067124a7e491ae29f8e50666) Merged-In: I400392ba9cf7e6d35af78d6b668d52abee27497d Change-Id: I400392ba9cf7e6d35af78d6b668d52abee27497d
2023-10-27Merge "Fix lunch choices for git_main" into mainTreehugger Robot
2023-10-26redfin(nfc): Modify NFC overlays for NFC apex am: e3ab1a70e6 am: 878d49da6a ↵Roshan Pius
am: eb6adee6af Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2802546 Change-Id: I809d99558d7ae91ecd1810a1a7a00d5a4fe9d435 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26redfin(nfc): Modify NFC overlays for NFC apex am: e3ab1a70e6 am: 808887442b ↵Roshan Pius
am: 9f6bf7e0ff Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2802546 Change-Id: Ic5afe2195fcc991dfd5b5076ae9258687a4062f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26redfin(nfc): Modify NFC overlays for NFC apex am: e3ab1a70e6 am: 878d49da6aRoshan Pius
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2802546 Change-Id: I2a1e359f62c7aaf8277685a83aa4e03734b5929d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26redfin(nfc): Modify NFC overlays for NFC apex am: e3ab1a70e6 am: 808887442bRoshan Pius
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2802546 Change-Id: I468184416cf76be03d95bf8d84bc49dfba61c26b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26redfin(nfc): Modify NFC overlays for NFC apex am: e3ab1a70e6Roshan Pius
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2802546 Change-Id: I9634de16cc4caf25b503fec244bd8577affea12c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26redfin(nfc): Modify NFC overlays for NFC apex am: e3ab1a70e6Roshan Pius
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2802546 Change-Id: I13469cad8012080a78db719ffd1a4d3f8385d75f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25Fix lunch choices for git_mainGreg Kaiser
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch Change-Id: I400392ba9cf7e6d35af78d6b668d52abee27497d
2023-10-25redfin(nfc): Modify NFC overlays for NFC apexRoshan Pius
Bug: 307763519 Test: Manual flash and tested the overlay values are taking effect. Change-Id: I8c995bcd3d0dd18ce6531f627d785f18abc81150
2023-10-19[automerger skipped] Merge 10952656 am: 3501131eec -s ours am: fab3c83342 -s ↵Xin Li
ours am skip reason: Merged-In Ie76dbd7b03abc3ad69137483854af5435d642196 with SHA-1 23ed5c2a41 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/25093200 Change-Id: Iec5dd6fcec17acd0265db4b818657fddd5b49717 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: 3501131eec -s oursXin Li
am skip reason: Merged-In Ie76dbd7b03abc3ad69137483854af5435d642196 with SHA-1 23ed5c2a41 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/25093200 Change-Id: I6ac8c5c2c21e5d47c51f70ef0bbe04f129608ecb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656Xin Li
Merged-In: Ie76dbd7b03abc3ad69137483854af5435d642196 Change-Id: I5d56fe18408df2b29da3176d26eddcaedfc74865
2023-10-10Snap for 10929834 from bec8ccd099ab0f4d0b00724b6b050004b663dba0 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I09d65939f9cbad602ef6247ff822f23f18bf280a
2023-10-07[automerger skipped] Merge Android 14 am: bec8ccd099 -s ours am: d434fce89c ↵Xin Li
-s ours am: 81068fb0ba -s ours am: c12f270dd1 -s ours am: 23ed5c2a41 -s ours am skip reason: Merged-In I4b47171f62daebb85bb405e7a9713ef32c888913 with SHA-1 f2a2675372 is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2774920 Change-Id: Ie07332298ea2e1ab4a79a61d59801eda9933cdb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: bec8ccd099 -s ours am: d434fce89c ↵Xin Li
-s ours am: 81068fb0ba -s ours am: c12f270dd1 -s ours am skip reason: Merged-In I4b47171f62daebb85bb405e7a9713ef32c888913 with SHA-1 f2a2675372 is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2774920 Change-Id: Ie76dbd7b03abc3ad69137483854af5435d642196 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: bec8ccd099 -s ours am: d434fce89c ↵Xin Li
-s ours am: 81068fb0ba -s ours am skip reason: Merged-In I4b47171f62daebb85bb405e7a9713ef32c888913 with SHA-1 f2a2675372 is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2774920 Change-Id: I75c212eeedb4a903aa49263103830bd258cebd43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: bec8ccd099 -s ours am: d434fce89c ↵Xin Li
-s ours am skip reason: Merged-In I4b47171f62daebb85bb405e7a9713ef32c888913 with SHA-1 f2a2675372 is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2774920 Change-Id: I323634d84a81b39ba85f325687f2cf5efaf5fad3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: bec8ccd099 -s oursXin Li
am skip reason: Merged-In I4b47171f62daebb85bb405e7a9713ef32c888913 with SHA-1 f2a2675372 is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2774920 Change-Id: If0e7cc46a791c9a9fe261442138a4316df682714 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I4b47171f62daebb85bb405e7a9713ef32c888913 Change-Id: I26485463cbb687dd4350cf49a7f72985f99c995b
2023-10-04Snap for 10900817 from f2a26753724359698d6afeecfacb7b1d7f51199c to sdk-releaseplatform-tools-34.0.5Android Build Coastguard Worker
Change-Id: I65f36f0caa57a85835e4277dfe319e63ff7b5113
2023-10-04Add BUILD_BROKEN_INCORRECT_PARTITION_IMAGES am: a219f1e783 am: 59249f9df3 ↵Cole Faust
am: 0075192d06 Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/24933912 Change-Id: Ifbadea78931e235f6530ce3a65fff97a9cae23a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Add BUILD_BROKEN_INCORRECT_PARTITION_IMAGES am: a219f1e783 am: 59249f9df3Cole Faust
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/24933912 Change-Id: I6dec274bdb1a6e520f53d9bbcebf988742118f9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Add BUILD_BROKEN_INCORRECT_PARTITION_IMAGES am: a219f1e783Cole Faust
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/24933912 Change-Id: I147458bcc65dae655ad91b81b5386ebc92355ab1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Add BUILD_BROKEN_INCORRECT_PARTITION_IMAGESCole Faust
Redfin has issues that prevent it from working with a hermetic partition build. Bug: 205632228 Test: Presubmits Change-Id: Id3dbfd1f7e25d346d5cd31ad04f3d8973889e472
2023-09-21usb: upgrade stats AIDL to v2Roy Luo
Upgrade stats AIDL to v2 following pixelstats lib. Bug: 297224564 Test: Build Change-Id: Iebc5cee69a21faa302a100d6efcf89b2a05e1bc0
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: bcac91a7d0 -s ours ↵Xin Li
am: e001ba5ec4 -s ours am: 866ffbbb1b -s ours am: f9f9b37180 -s ours am skip reason: Merged-In Icfe4ab552a7ee4823ae7c9046cb5d8758db711ff with SHA-1 8254c91388 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/24182056 Change-Id: Ic323ae65c3dc80f79f48c928b164c240192a8139 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: bcac91a7d0 -s ours ↵Xin Li
am: e001ba5ec4 -s ours am: 866ffbbb1b -s ours am skip reason: Merged-In Icfe4ab552a7ee4823ae7c9046cb5d8758db711ff with SHA-1 8254c91388 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/24182056 Change-Id: I7ed7b71951b861ae7513988bef246450e6f162cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: bcac91a7d0 -s ours ↵Xin Li
am: e001ba5ec4 -s ours am skip reason: Merged-In Icfe4ab552a7ee4823ae7c9046cb5d8758db711ff with SHA-1 8254c91388 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/24182056 Change-Id: I6749db5602e15300ed6b9a85b958f60fc1168671 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: bcac91a7d0 -s oursXin Li
am skip reason: Merged-In Icfe4ab552a7ee4823ae7c9046cb5d8758db711ff with SHA-1 8254c91388 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/24182056 Change-Id: I9da1e7be2484cd9cc014d429beb5cc68148da811 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: Icfe4ab552a7ee4823ae7c9046cb5d8758db711ff Change-Id: Ice0b1cce1364a62966164d7dd14de8f56653971d
2023-07-28device FCM -= android.* am: f2a2675372 am: 2443a6a6b3 am: cbc6f50bb9 am: ↵Steven Moreland
da5414d4bf am: f6a758220d Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2654090 Change-Id: Ia6e629bf8fb365b61cbc3f95a63223fae550d7fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28device FCM -= android.* am: f2a2675372 am: 2443a6a6b3 am: cbc6f50bb9 am: ↵Steven Moreland
da5414d4bf Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2654090 Change-Id: Ia85f88fa8f9284457a2944d7f4f6cd958a99ff2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28device FCM -= android.* am: f2a2675372 am: 2443a6a6b3 am: cbc6f50bb9Steven Moreland
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2654090 Change-Id: I214e6446eb9581ed7a554426f5c3116de1bfd826 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28device FCM -= android.* am: f2a2675372 am: 2443a6a6b3Steven Moreland
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2654090 Change-Id: I0d37656d310263fe074af0ba6369247bca0f298d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28device FCM -= android.* am: f2a2675372Steven Moreland
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2654090 Change-Id: I5c4a6eec5249252ac34991c02a60a54ebc8da4d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12device FCM -= android.*Steven Moreland
Bug: 290408770 Test: N/A Change-Id: I4b47171f62daebb85bb405e7a9713ef32c888913
2023-06-28Snap for 10399941 from 49d28ef7cb8b36ea41380a6c42bcabd9d4659e36 to sdk-releaseplatform-tools-34.0.4Android Build Coastguard Worker
Change-Id: I6b11aed58a0f7dd359701bd298a01a3bf2e0de97
2023-06-09redfin: remove customizedMaxCachedProcesses am: e86bdd7e97 am: 0dc9d579b8Richard Chang
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: I2e603b500c98ce6bca464a774e157df9424b0c57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18redfin: remove customizedMaxCachedProcesses am: e86bdd7e97Richard Chang
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: Iaf4a886b0ee98b86ddf8bc1ae9f8b4dc814e9a7a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16redfin: remove customizedMaxCachedProcesses am: e86bdd7e97 am: f0327cf982 ↵Richard Chang
am: 41aa025190 am: d3472e91e2 Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: I813cfa8028ecb367c0e0fe79e87a3f43d694530e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16redfin: remove customizedMaxCachedProcesses am: e86bdd7e97 am: 8254c91388 ↵Richard Chang
am: 77c29da726 am: 6a97b91334 Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: I69ba8f31fc2bba52b74290bdc9e93843cb2875cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16redfin: remove customizedMaxCachedProcesses am: e86bdd7e97 am: f0327cf982 ↵Richard Chang
am: 5d712add2e am: 3e029dad6d Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: Ic65321d51abd9ef7774f3dc4ce57869c66e9e06f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16redfin: remove customizedMaxCachedProcesses am: e86bdd7e97 am: f0327cf982 ↵Richard Chang
am: 41aa025190 Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: I55eea9033390abf4591822a856c0be6fde9e2134 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16redfin: remove customizedMaxCachedProcesses am: e86bdd7e97 am: 8254c91388 ↵Richard Chang
am: 77c29da726 Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: I54b0fe6d621f3db1d410566b3834ebfb2de28991 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16redfin: remove customizedMaxCachedProcesses am: e86bdd7e97 am: f0327cf982 ↵Richard Chang
am: 5d712add2e Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: I1958372e5896ce027155f2414d80dd918f5e85f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16redfin: remove customizedMaxCachedProcesses am: e86bdd7e97 am: 8254c91388Richard Chang
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: Ibf980001a14cd6c88f9ae61fc6c531c3c6cbbdbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16redfin: remove customizedMaxCachedProcesses am: e86bdd7e97 am: f0327cf982android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseRichard Chang
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: I0ef453ea1a4e92c39b100c412a0fef2441f516c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16redfin: remove customizedMaxCachedProcesses am: e86bdd7e97 am: 3fb352c5e0Richard Chang
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/23235741 Change-Id: I7e4f0b88b6ccc86627d2956631bf29ffa4a39b05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 22:21:25 +0000