aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 23764b95d6 -s ↵android-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-releaseXin Li
ours am: b68cfec20a -s ours am skip reason: Change-Id I874fdeb7cee346b0beb9c897a57f4076a8ae4a99 with SHA-1 00f96b3f5a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I27ef01734a4cba57b8d04642984a96fdce299585
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest" am: 3c480017c1 ↵Bob Badour
am: 8fb3ab4e2e am: 966cc388cc Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1587903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9bc292f1ebb5837b16f162ad2235d65db397cfe4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 23764b95d6 -s oursXin Li
am skip reason: Change-Id I874fdeb7cee346b0beb9c897a57f4076a8ae4a99 with SHA-1 00f96b3f5a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1746829d7b2ef1dfa4ad2f8a0bc8cf51499b6240
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: I874fdeb7cee346b0beb9c897a57f4076a8ae4a99 Change-Id: Ia81fbafa17f81c88f0ce4991ac5d7e159e8bb34c
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest" am: 3c480017c1 ↵Bob Badour
am: 8fb3ab4e2e Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1587903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I18ca0e0963ecd9f264ddda71fe57c3958feb8a1c
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest" am: 3c480017c1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1587903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c7418ff14e29f246216feb0fe887b755458d0c9
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrest"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/hamcrestBob Badour
Added SPDX-license-identifier-BSD to: Android.bp hamcrest-core/Android.bp hamcrest-library/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Id9817834e456f065748b1b021cefc612567d2ca3
2020-11-24Mark ab/6881855 as merged am: 9b5182989e am: 00f96b3f5aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/13110884 Change-Id: Id611c0fbabff3ceb2c8a27cea2b61ffb7a9f8534
2020-11-24Mark ab/6881855 as merged am: 9b5182989eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/13110884 Change-Id: I874fdeb7cee346b0beb9c897a57f4076a8ae4a99
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I6935ec8dff81c2090cda67ff6fb969d4ba40730b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3812aa80b3 -s ours am: ↵Xin Li
12bceca8e4 -s ours am: 58d38804a5 -s ours am skip reason: Change-Id Ifd4ae9b232d5e6a745c88a6b5ff22fecac71ab8e with SHA-1 bb6eea21ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12796087 Change-Id: Ie42509f97ac75a6318400434f57963c99e123655
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3812aa80b3 -s ours am: ↵Xin Li
12bceca8e4 -s ours am skip reason: Change-Id Ifd4ae9b232d5e6a745c88a6b5ff22fecac71ab8e with SHA-1 bb6eea21ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12796087 Change-Id: Ia1f7a5c4e2c6ae100e909e7d406bf3bf593f17f8
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3812aa80b3 -s oursXin Li
am skip reason: Change-Id Ifd4ae9b232d5e6a745c88a6b5ff22fecac71ab8e with SHA-1 bb6eea21ed is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12796087 Change-Id: I72f5843c0766e57a806c269521aa1cbd294624ad
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ifd4ae9b232d5e6a745c88a6b5ff22fecac71ab8e Change-Id: Ia2267116235f3624b1cd8aa835a1df62038f5790
2020-09-11[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s ours am: ↵Xin Li
d4f513a2e3 -s ours am: 34a847f361 -s ours am: 8afa499e12 -s ours am: 45e08efd13 -s ours am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1422369 Change-Id: I647b307ea0d52a08638b297bc97eea468872aa8f
2020-09-11[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s ours am: ↵Xin Li
d4f513a2e3 -s ours am: 34a847f361 -s ours am: 8afa499e12 -s ours am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1422369 Change-Id: I1996003bc71ed9ba5f4999323ea1c7f83db403ff
2020-09-11[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s ours am: ↵Xin Li
d4f513a2e3 -s ours am: 34a847f361 -s ours am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1422369 Change-Id: Iffa6471bdd04b2fc3953e1a2dfe8d41dca607052
2020-09-11[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s ours am: ↵Xin Li
d4f513a2e3 -s ours am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1422369 Change-Id: I41119acf50ecede95add936f6a8a586eb7b280c4
2020-09-11[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s oursXin Li
am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1422369 Change-Id: I3b1476c55a689d177fcfe9232ea8027e6200136b
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd Change-Id: Ib817e5d5346d8ad11c1f38944d910176f9cdc7bf
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85e5a7f644 -s ours am: 3b2d8d561e -s ours am: 814572cd4e -s ours am: 7aef08905c -s ours am skip reason: Change-Id I155b87208e6fc16bced6f6f295b84f79c5287147 with SHA-1 346bc2c2e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12470114 Change-Id: I8b46b156574ec50afe3bddbf41128c5bd61300bd
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85e5a7f644 -s ours am: 3b2d8d561e -s ours am: 814572cd4e -s ours am skip reason: Change-Id I155b87208e6fc16bced6f6f295b84f79c5287147 with SHA-1 346bc2c2e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12470114 Change-Id: Icd44a11b84273335e4b48da90bb41387f57f55b0
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85e5a7f644 -s ours am: 3b2d8d561e -s ours am skip reason: Change-Id I155b87208e6fc16bced6f6f295b84f79c5287147 with SHA-1 346bc2c2e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12470114 Change-Id: I38e9f27f0c3b8ed013fd15378a56ff757794e389
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85e5a7f644 -s ours am skip reason: Change-Id I155b87208e6fc16bced6f6f295b84f79c5287147 with SHA-1 346bc2c2e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/12470114 Change-Id: Ib84272f4ba873c9c35679c16831c6b7272b84096
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I155b87208e6fc16bced6f6f295b84f79c5287147 Change-Id: I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE" am: f02197f28c am: ↵Treehugger Robot
c3f6da7e65 am: 346bc2c2e0 am: bb6eea21ed am: 895d226047 Change-Id: I39983c2950dd16c52c94141569d0bd59af38ea22
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE" am: f02197f28c am: ↵Treehugger Robot
c3f6da7e65 am: 346bc2c2e0 am: bb6eea21ed Change-Id: I7ae5da1902a29760568ddc06e6185a98c721ac9e
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE" am: f02197f28c am: ↵Treehugger Robot
c3f6da7e65 am: 346bc2c2e0 Change-Id: Ifd4ae9b232d5e6a745c88a6b5ff22fecac71ab8e
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE" am: f02197f28c am: ↵Treehugger Robot
c3f6da7e65 Change-Id: I155b87208e6fc16bced6f6f295b84f79c5287147
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE" am: f02197f28candroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I42705142aa37b7bb5369f35dce0b442a74f391cd
2020-04-29Merge "Add METADATA to hamcrest: BSD+Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to hamcrest: BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ib0c401f11f465712187fc672623bdab0eaa27071
2020-02-20Revert "Pin hamcrest-core to Java language level 8."Jerome Gaillard
The original change was made to support loading this library from an OpenJDK 8 runtime as part of layoutlib. This is no longer required as layoutlib now runs with OpenJDK 11. This reverts commit f56998f296c67496d433b4f18c5080cb82be9dd9. Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make layoutlib layoutlib-tests sdk libandroid_runtime Test: frameworks/layoutlib/bridge/tests/run_tests.sh out/layoutlib-failures Bug: 142116384 Change-Id: If5a3c02a37d7a613be7c10f468efd36482a4ace2
2019-10-04Merge "Pin hamcrest-core to Java language level 8."r_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-releasePete Gillin
2019-10-03Merge "external/hamcrest: set libcore as OWNERS" am: 7910c99d08 am: ↵Tobias Thierer
77b3f40edc am: aeec6a95cf am: 03971a91bc Change-Id: I591f4f595cf2f4966e64dfe3ffb7d593e365d813
2019-10-03Merge "external/hamcrest: set libcore as OWNERS" am: 7910c99d08 am: 77b3f40edcandroid-r-preview-4android-r-preview-3android-r-preview-2android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseTobias Thierer
am: aeec6a95cf Change-Id: Id149bbfc19b184de8dbc2c40279756ddf10c06e3
2019-10-03Merge "external/hamcrest: set libcore as OWNERS" am: 7910c99d08Tobias Thierer
am: 77b3f40edc Change-Id: I301eefc6111c70662dc6ddae7230d65ac56fac06
2019-10-03Merge "external/hamcrest: set libcore as OWNERS"android-r-preview-1Tobias Thierer
am: 7910c99d08 Change-Id: I34af8c1c634d52e11625b71ea28379541d4c78e8
2019-10-03Merge "external/hamcrest: set libcore as OWNERS"ndk-sysroot-r21Treehugger Robot
2019-10-03external/hamcrest: set libcore as OWNERSTobias Thierer
They're probably as good as anybody for owning this barely-maintained project. Test: Treehugger Change-Id: Iaa8b0159f76c8eafc4c749c21f2cac31aef6abd1
2019-10-03Pin hamcrest-core to Java language level 8.Pete Gillin
These jars are loaded by an OpenJDK 8 runtime from prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh so the upcoming change of the platform default to Java language level 9 will break those tests. This change can be reverted if/when prebuilts/studio/jdk is upgraded to OpenJDK 9+. Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make layoutlib layoutlib-tests sdk libandroid_runtime Test: frameworks/layoutlib/bridge/tests/run_tests.sh out/layoutlib-failures Bug: 141970724 Change-Id: I2369718c694f7c3f739dfae426aba5962892e53b
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-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_r12android10-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-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 2490056442 -s ours am skip reason: subject contains skip directive Change-Id: Iaef4efa2b406df639734491c3cf2a3de4877fe61
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: I8bf6f948a13e3d3540bcb6db87e225c63104a53e
2019-01-11Merge "Add default code reviewers into OWNERS" am: 09d9bf1ee3 am: 7dd738f97dChih-hung Hsieh
am: 5e56cb9c8a Change-Id: Ia7ef31de1d21295c8aae66f4078e7229f8328545
2019-01-11Merge "Add default code reviewers into OWNERS" am: 09d9bf1ee3Chih-hung Hsieh
am: 7dd738f97d Change-Id: I875970262c316c0be731ca820b2b9d98ac3e424d
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 09d9bf1ee3 Change-Id: I18d84c0bf49d01b1ee3fff45e742dbcbe6970013
2019-01-11Merge "Add default code reviewers into OWNERS"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-releaseChih-hung Hsieh
2019-01-11Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I1d2f9134e4e9a0063e4104282200ec42f5369a4c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 16:36:25 +0000