aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-26Pass output file argument to guice_munge instead of redirecting.HEADmastermainPeter Collingbourne
It looks like a recent change to the JDK has caused logs to be written to stdout intermittently, causing errors such as the following when compiling a source file processed by guice_munge: out.cfa64l5/soong/.intermediates/external/guice/guice/linux_glibc_common/javac/srcjars/external/guice/core/src/com/google/inject/internal/InternalProviderInstanceBindingImpl.java:1: error: class, interface, enum, or record expected [0.003s][warning][perf,memops] Cannot use file /tmp/hsperfdata_nobody/75537 because it is locked by another process (errno = 11) ^ Avoid the problem by passing an output file argument to guice_munge instead of redirecting stdout to the output file. Bug: 330410989 Change-Id: I218f9b8597b77350e810d1bfcfa60fe94312c876
2023-02-07Patch visibility to stay limited and reviewed am: f359d312b9 am: 671773e8d4 ↵android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devJulien Desprez
am: 7567a2e602 Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2423427 Change-Id: I679f45837149541282cd15db58fffc70db5f92ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07Patch visibility to stay limited and reviewed am: f359d312b9 am: 671773e8d4Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2423427 Change-Id: Ia513918a9a7ccdbc85257296aa5068d8f3b57cb6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07Patch visibility to stay limited and reviewed am: f359d312b9android-u-beta-1-gplJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2423427 Change-Id: I95e2f29388ec5d4d9dc60b4fee46a48fb06c624c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06Patch visibility to stay limited and reviewedJulien Desprez
Test: presubmit Bug: None Change-Id: I8a50319134a65f76df082738ddc5fadeac18f7ec
2022-10-17Revert "Filter out OpenJDK warning message" am: db197dc223 am: 90ab1b89eb ↵Sorin Basca
am: 1c032724de Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2257032 Change-Id: Ie33bcafb7cc0fc28b24566ea0fe319a38e731cc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17Revert "Filter out OpenJDK warning message" am: db197dc223 am: 90ab1b89ebSorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2257032 Change-Id: Ic6c693789cd9c1f2617e626f4050c4d7ad6f297c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17Revert "Filter out OpenJDK warning message" am: db197dc223main-16k-with-phonesSorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2257032 Change-Id: I10fa1548f6c791e50f91fc6870f55503bc553cef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17Revert "Filter out OpenJDK warning message"Sorin Basca
This reverts commit a9432ee7bd5a17c465285dc443ba833dd326678d. Reason for revert: No longer needed after aosp/2245074 and aosp/2245353. Change-Id: I3f39244b7cff841fe561083705fbbd748a48b66c
2022-09-06Filter out OpenJDK warning message am: a9432ee7bd am: a78b3f4225 am: ↵Sorin Basca
6edd2fed3d am: 440d1e8089 am: e2075a9453 Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2162361 Change-Id: I84ba236b7b62ef63153d2cdaba9e03994e023739 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06Filter out OpenJDK warning message am: a9432ee7bd am: a78b3f4225 am: ↵Sorin Basca
6edd2fed3d am: 440d1e8089 Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2162361 Change-Id: I97c33c840db0f9844a610dd8e51d8dc1ac388a1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06Filter out OpenJDK warning message am: a9432ee7bd am: a78b3f4225 am: 6edd2fed3dSorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2162361 Change-Id: Iffb43756449734b63bc924a64b67f13b4dc9ac98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06Filter out OpenJDK warning message am: a9432ee7bd am: a78b3f4225Sorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2162361 Change-Id: I58ae9a5fef47a9b80c2d1d538b5c57f958443dbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06Filter out OpenJDK warning message am: a9432ee7bdSorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2162361 Change-Id: I79ad90eb08f22fb2264e5b0ece65446b30c74715 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01Filter out OpenJDK warning messageSorin Basca
Bug: 240131965 Test: m guice Change-Id: Ia0d86dcc4c66aab1fb0130443ad13b9236d1a1b3
2021-12-16Merge "Remove log4j jar file" am: eb43f1bcc8 am: e0d8bc5da9 am: 3716040dca ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Baligh Uddin
am: dca0bf0a51 Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1927618 Change-Id: Ida756a174ac7dd2fb05feccb877c8687f7d05b39
2021-12-16Merge "Remove log4j jar file" am: eb43f1bcc8 am: e0d8bc5da9 am: 3716040dcaBaligh Uddin
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1927618 Change-Id: I1c6cd6c69cccd61be886260688401c5cb5ac281f
2021-12-16Merge "Remove log4j jar file" am: eb43f1bcc8 am: e0d8bc5da9Baligh Uddin
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1927618 Change-Id: Icf98bba1d76fdebf14e2da966d912b9cbf300c7a
2021-12-16Merge "Remove log4j jar file" am: eb43f1bcc8Baligh Uddin
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1927618 Change-Id: I67a0ace2f69e8160e76cec57748f2fe3644ad3e1
2021-12-16Merge "Remove log4j jar file"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Baligh Uddin
2021-12-16Remove log4j jar fileDan Shi
Bug: 205161803 Bug: 210115136 Test: presubmit Change-Id: I10abc0c915ecf72681b095b67cd11c103dce79a7
2021-11-30Enforce visibility of module guice am: 1afd1b1b25 am: aa1454ebe2 am: ↵Dan Shi
0e9314fa47 am: 2f0779c9e0 Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1906791 Change-Id: I2cff4bc02c4439f828041d8160311ddb4654a16e
2021-11-30Enforce visibility of module guice am: 1afd1b1b25 am: aa1454ebe2 am: 0e9314fa47Dan Shi
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1906791 Change-Id: Iff9d93686b45605333442ba293c49db21bcf8857
2021-11-30Enforce visibility of module guice am: 1afd1b1b25 am: aa1454ebe2Dan Shi
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1906791 Change-Id: I82f78a19c99af83486c233ee9b1ef1a9405f5167
2021-11-30Enforce visibility of module guice am: 1afd1b1b25Dan Shi
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1906791 Change-Id: I2ad7323287f4745998a5c6450dd29c49e4ccf431
2021-11-30Enforce visibility of module guiceDan Shi
Bug: 205161803 Test: m guice Change-Id: Ibd7c35a8f454165a3bb3f194f78b00791706ce60
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I21b2567f4ec644c4cf53a9c9bc3c3cb556ea440f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8a4c87a309 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: c00ff406b4 -s ours am: 6c56943a3c -s ours am skip reason: Change-Id Ie73488f7da50d4301d4718f57891b6fc3590d28c with SHA-1 b8d30fba19 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5e3ce810ddb63e9c0765b101f2d35af038c66f5c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8a4c87a309 -s ↵Xin Li
ours am: c00ff406b4 -s ours am: 6c56943a3c -s ours am skip reason: Change-Id Ie73488f7da50d4301d4718f57891b6fc3590d28c with SHA-1 b8d30fba19 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c7b3dc2fb9ccf12916980f18507f7bceefe893e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8a4c87a309 -s ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-s-v2-preview-1Xin Li
ours am: c00ff406b4 -s ours am skip reason: Change-Id Ie73488f7da50d4301d4718f57891b6fc3590d28c with SHA-1 b8d30fba19 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If96421533e59798a8d1af9fce984b53732365b22
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8a4c87a309 -s oursXin Li
am skip reason: Change-Id Ie73488f7da50d4301d4718f57891b6fc3590d28c with SHA-1 b8d30fba19 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icf1283cbab230926071ff54931e7b689e696e761
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Ie73488f7da50d4301d4718f57891b6fc3590d28c Change-Id: I86db90f3d41e8188a37802d5e8292b0f58d00f39
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/guice am: 656c2489c0 am: ↵Bob Badour
c3c1760112 am: 0701265d55 am: af1429b654 Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1588958 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5c8561b4cc0df77c91e071f773bb18dc065ab170
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/guice am: 656c2489c0 am: ↵Bob Badour
c3c1760112 am: 0701265d55 am: af1429b654 Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1588958 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica28ff2b6d6594930627c0b050ed4ecf76543692
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/guice am: 656c2489c0 am: ↵Bob Badour
c3c1760112 am: 0701265d55 Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1588958 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idb390d15b8f3f63b135ab759d7b38eb2b12009f9
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/guice am: 656c2489c0 am: c3c1760112Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1588958 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I89f7362bf1aacedc1fa5774c46e8b5a0c74b9013
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/guice am: 656c2489c0Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1588958 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I893957a6128215354ece76e8093b542578048d0f
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/guiceandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I048d375468fd647af015eb338b698c3ead4a1f8a
2020-11-24Mark ab/6881855 as merged am: 651bd061bd am: b8d30fba19Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/guice/+/13111004 Change-Id: I4e7733140abc9b3aeb2d76cb37d04343cf2610c8
2020-11-24Mark ab/6881855 as merged am: 651bd061bdXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/guice/+/13111004 Change-Id: Ie73488f7da50d4301d4718f57891b6fc3590d28c
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I8522582d2ebaa4ef23c2d67f2079243971868a41
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 21b4162580 -s ours am: ↵Xin Li
be6f99a948 -s ours am: 0c69656e64 -s ours am skip reason: Change-Id Idd77abe53e4cfc10cd40e3ae3d4e8724a9d9f608 with SHA-1 2e36d130d1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/guice/+/12796864 Change-Id: Ib6b075d3e0ce0063b9b88d225d4a75160837b93d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 21b4162580 -s ours am: ↵Xin Li
be6f99a948 -s ours am skip reason: Change-Id Idd77abe53e4cfc10cd40e3ae3d4e8724a9d9f608 with SHA-1 2e36d130d1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/guice/+/12796864 Change-Id: I8e2d6429cf62b3543c1589a884117dc77bca3ab6
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 21b4162580 -s oursXin Li
am skip reason: Change-Id Idd77abe53e4cfc10cd40e3ae3d4e8724a9d9f608 with SHA-1 2e36d130d1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/guice/+/12796864 Change-Id: I9f0430d6cbba47670c95466e0da9bf1a04b7ead6
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Idd77abe53e4cfc10cd40e3ae3d4e8724a9d9f608 Change-Id: I115f50314552483b61b53b7da788ae450133f5b8
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 3c17c700a6 -s ours am: e845e77d7c -s ours am: 7589070654 -s ours am: a3473dd8c5 -s ours am skip reason: Change-Id I534e47a2a081a5fbbb3010c2150336acee3b6d14 with SHA-1 df4a9fa828 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/guice/+/12469911 Change-Id: Ia2f6954aa79dbb32f3027204512aaf5e5fbf3093
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 3c17c700a6 -s ours am: e845e77d7c -s ours am: 7589070654 -s ours am skip reason: Change-Id I534e47a2a081a5fbbb3010c2150336acee3b6d14 with SHA-1 df4a9fa828 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/guice/+/12469911 Change-Id: I019096f7dacae8c262e3c4fd6d2b582db6850783
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 3c17c700a6 -s ours am: e845e77d7c -s ours am skip reason: Change-Id I534e47a2a081a5fbbb3010c2150336acee3b6d14 with SHA-1 df4a9fa828 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/guice/+/12469911 Change-Id: I1cd010acc5664a0fce9e994af58b51053fee0699
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 3c17c700a6 -s ours am skip reason: Change-Id I534e47a2a081a5fbbb3010c2150336acee3b6d14 with SHA-1 df4a9fa828 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/guice/+/12469911 Change-Id: I4aad0473a1f27ba6e9d83f2365306fa0653d4080
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I534e47a2a081a5fbbb3010c2150336acee3b6d14 Change-Id: I98a50e328c55c829f17ed10e7e9fe9574f27a24a