aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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
2020-07-27guice: Remove .class files from srcjar am: a3c7060e68 am: 2f95fdaee2 am: ↵Luca Stefani
b58f67bb36 am: 2e36d130d1 am: 05670ad29b Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1372581 Change-Id: I1d06e0ff4aeaa40acef6eed7be98b628c5bed147
2020-07-27guice: Remove .class files from srcjar am: a3c7060e68 am: 2f95fdaee2 am: ↵Luca Stefani
b58f67bb36 am: 2e36d130d1 Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1372581 Change-Id: I5773a97ef343f9e2075eaff02a7b88bf04dc6abd
2020-07-27guice: Remove .class files from srcjar am: a3c7060e68 am: 2f95fdaee2 am: ↵Luca Stefani
b58f67bb36 Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1372581 Change-Id: Idd77abe53e4cfc10cd40e3ae3d4e8724a9d9f608
2020-07-27guice: Remove .class files from srcjar am: a3c7060e68 am: 2f95fdaee2Luca Stefani
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1372581 Change-Id: I1573a90ccab81280f08c3a9aeb3f4e9f1dd4ef06
2020-07-27guice: Remove .class files from srcjar am: a3c7060e68Luca Stefani
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1372581 Change-Id: I1ddf10b7fa0d7f593fbaaa6509c747fc38b2997d
2020-07-27guice: Make guice_munge_srcjar generation quiet am: 9f85ddebcf am: ↵Luca Stefani
e04d717abc am: b3f29d702e am: a221b5449f am: 9b20a98d8b Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1372796 Change-Id: Id42a5717cd196e2d4d8f98e8ffb5c4f951d17f55
2020-07-27guice: Make guice_munge_srcjar generation quiet am: 9f85ddebcf am: ↵Luca Stefani
e04d717abc am: b3f29d702e am: a221b5449f Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1372796 Change-Id: I6fe02115cba1fa31fe7c47a6989655cce54bf010
2020-07-27guice: Make guice_munge_srcjar generation quiet am: 9f85ddebcf am: ↵Luca Stefani
e04d717abc am: b3f29d702e Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1372796 Change-Id: I124a31d8de1df2a0aef7a90410d8ebd21d3e7d14
2020-07-27guice: Make guice_munge_srcjar generation quiet am: 9f85ddebcf am: e04d717abcLuca Stefani
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1372796 Change-Id: If5813eac86808422e40bc26614e5d70a305e845f
2020-07-27guice: Make guice_munge_srcjar generation quiet am: 9f85ddebcfLuca Stefani
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/1372796 Change-Id: Ifb583717dd56635a868615b2604507fa5b40a993
2020-07-26guice: Remove .class files from srcjarLuca Stefani
* They don't belong in a srcjar Change-Id: I63a3731ec25cb433cd4fa4ddf6c806b7fb32e311
2020-07-25guice: Make guice_munge_srcjar generation quietLuca Stefani
Change-Id: I3ec294af337f8ed80a0521190157fe1aef478125
2020-04-24Add license type: Apache2 is a NOTICE license am: 7ec1289084 am: 362cdb1e95 ↵Bob Badour
am: df4a9fa828 am: 18ae55f35d am: ab66cb9da2 Change-Id: I3e4658a965ac1bfe7f1e7a9c2398bc5432340d18
2020-04-24Add license type: Apache2 is a NOTICE license am: 7ec1289084 am: 362cdb1e95 ↵Bob Badour
am: df4a9fa828 am: 18ae55f35d Change-Id: I9367b6f678a062ec07c7a3ef0ac881723a0f9063
2020-04-24Add license type: Apache2 is a NOTICE license am: 7ec1289084 am: 362cdb1e95 ↵Bob Badour
am: df4a9fa828 Change-Id: Iacffca7b1e8bf1701441248bb30a463b06428fcb
2020-04-24Add license type: Apache2 is a NOTICE license am: 7ec1289084 am: 362cdb1e95Bob Badour
Change-Id: I534e47a2a081a5fbbb3010c2150336acee3b6d14
2020-04-24Add license type: Apache2 is a NOTICE license am: 7ec1289084android-r-beta-3android-r-beta-2Bob Badour
Change-Id: I901ad557fea5f0ebab85a47a982aab94f9d9b711
2020-04-23Add license type: Apache2 is a NOTICE licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I2d13889e4d808a85e0945788e27cd4640cdee1bd
2019-11-16Use unzip -p rather than -c. am: 0ee306fdf3 am: 536c2ca40ar_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseElliott Hughes
am: a0e72c4fb3 Change-Id: I7ee3935d7d44c469ff7dec7b1996e5f1120a51dd
2019-11-16Use unzip -p rather than -c. am: 0ee306fdf3android-r-preview-4android-r-preview-3android-r-preview-2Elliott Hughes
am: 536c2ca40a Change-Id: I1ecd88fbfe6de92a9e65194c510218a5e56794d5
2019-11-16Use unzip -p rather than -c.android-r-preview-1Elliott Hughes
am: 0ee306fdf3 Change-Id: I8c4df7a579d5971916c13989fa10e65a87ebce4b
2019-11-15Use unzip -p rather than -c.Elliott Hughes
In the case of a single ASCII file (like here), there's no difference except that our libziparchive-based unzip supported -p. Test: builds even with ziptool unzip Change-Id: Id1f00db70e43144c302df89319951d82f5d5ddbb
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 16e7c2a6ac Change-Id: Ie54c2a5ee3a17d40d332598f2b09bec09fcb2aa8
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I6e2e28d45ee6803a75bcdf48ca581b01ba82229b
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Ieb7fcb4164c1cfdca0f41f7a8380a75a5e755618
2019-02-04Merge "Exit on failure in genrule for loop" am: 99f449dc82 am: bffc8cb9e8Colin Cross
am: ca830795d2 Change-Id: Ibd7b42fd7dfb2c1ecfcbc88b414e18b3fc7ca737
2019-02-04Merge "Exit on failure in genrule for loop" am: 99f449dc82Colin Cross
am: bffc8cb9e8 Change-Id: I8d982bc47685848df093912830ea2e3cc89b2b1c
2019-02-04Merge "Exit on failure in genrule for loop"Colin Cross
am: 99f449dc82 Change-Id: Ie8626a09964cae8e60b5cfb484874480ca06e1c2
2019-02-04Merge "Exit on failure in genrule for loop"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseTreehugger Robot
2019-01-14Add default code reviewers into OWNERS am: e9d37b2557 am: e8f40b706dChih-Hung Hsieh
am: b2ff7b35ad Change-Id: I0ec6a1e7bed3bb2488327beca61b46dc4fed0f78
2019-01-14Add default code reviewers into OWNERS am: e9d37b2557Chih-Hung Hsieh
am: e8f40b706d Change-Id: Ibec72f003a307177dcc23a7a0b7e86b3b7ab3445
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 19:42:23 +0000