aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie071e74b49de9ad7e24916f217a48fd00d4bd280
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s ours am: ↵Xin Li
8535401e0e -s ours am: 46e4cee555 -s ours am skip reason: Change-Id I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d with SHA-1 68c5822c91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12796462 Change-Id: Ibe51b36e3751f3f25e6eb32a065e566cbc083d79
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s ours am: ↵Xin Li
8535401e0e -s ours am skip reason: Change-Id I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d with SHA-1 68c5822c91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12796462 Change-Id: I7f1c86de3c610b71ed726d5611b8d361cfd5be8a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s oursXin Li
am skip reason: Change-Id I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d with SHA-1 68c5822c91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12796462 Change-Id: Ia7bc88b0936ff6943321c2df117cb3e586d86622
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d Change-Id: Icd25eae932b0da95ff4d92328e4c457945decbc9
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am: 3c864506c3 -s ours am: 1a7c6dde68 -s ours am: 2f99d67b10 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: Ibb136302d97e9b246b7a72ccb0eda4ba89beee30
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am: 3c864506c3 -s ours am: 1a7c6dde68 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: I755d2217483642cace074a0a03cf588912a6ba3e
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am: 3c864506c3 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: Iba304cdd5c175d26a49245f3a7282079cfa3abbd
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: Id57267bde02299dae7d802551237f3382bc2bf26
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s oursXin Li
am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: If01b5b0bc49f5d578648f4bc5935981b364e8a10
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I0e3537670da38a92f5a3a82290db17fc0570cb5a Change-Id: I3a4960ce4279bf5722ef787f98a2762b976645b5
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours am: 273aed17d3 -s ours am: 8afee8df59 -s ours am: 70d85ba1ae -s ours am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998 Change-Id: I4948fe4292fb7d95212029814592026937fe4952
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours am: 273aed17d3 -s ours am: 8afee8df59 -s ours am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998 Change-Id: I1fab34e69e96aab4cbc37f5767af2ec7320453d9
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours am: 273aed17d3 -s ours am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998 Change-Id: I1e2b63146ae67e8c68ee0223ca3772362d0458aa
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998 Change-Id: I2ea99a0044fc81ef241ba6611b2042792dafed97
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I38fc37dadb4e0f3f4540c18e48660456768d0c3e Change-Id: I0e3537670da38a92f5a3a82290db17fc0570cb5a
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license" am: bd7455035a ↵Treehugger Robot
am: 6fac8fec6c am: b50af440ad am: 68c5822c91 am: 5ef419f76b Change-Id: I828ab150b131126df274720cbb439be791b3f68f
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license" am: bd7455035a ↵Treehugger Robot
am: 6fac8fec6c am: b50af440ad am: 68c5822c91 Change-Id: I99a6f46afe89dc1ad88636e758547e5483fdf64f
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license" am: bd7455035a ↵Treehugger Robot
am: 6fac8fec6c am: b50af440ad Change-Id: I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license" am: bd7455035a ↵Treehugger Robot
am: 6fac8fec6c Change-Id: I38fc37dadb4e0f3f4540c18e48660456768d0c3e
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license" am: bd7455035aandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I5accc5971cd729e7a6f27a2dfb85d93e7c596bcb
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license"Treehugger Robot
2020-04-23Add license type: contains EPL = RECIPROCAL licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I8b820dc41c74231bc99f57617af50840ce20d63f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 23eb5b6109 -s ours am: d74f6bfccb am: 26adab2269 am: da6a9c78c4 -s ours am skip reason: subject contains skip directive Change-Id: I2556dcb22de5d157026fe54a19599c174f4fc42a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 23eb5b6109 -s ours am: d74f6bfccb am: 26adab2269 Change-Id: I3bca2b6ba8753a37deba0df0e39237ca999e7a1b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 23eb5b6109 -s ours am: d74f6bfccb Change-Id: Ic7a2fb8c1692fdc2fa748face2f21a8b23d8e73d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 23eb5b6109 -s ours am skip reason: subject contains skip directive Change-Id: Ic89d6984dd051927f17bebffb858143c319d340f
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I1a0a4b4fc29b07b50e3d89aba64383e314f39b0f
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 49f40ab7c8 -s ours am: 1e1be6dfb4 am: e8a12cf792 am: 74866dcc55 -s ours am skip reason: subject contains skip directive Change-Id: I9dfcb9376f8a9ffe240cdf782abf08ac2ac1773b
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 49f40ab7c8 -s ours am: 1e1be6dfb4 am: e8a12cf792 Change-Id: I7ba85d4b4f120272d839f6ebf29228d24e131929
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 49f40ab7c8 -s ours am: 1e1be6dfb4 Change-Id: I1077b7ca5d6cffe52e5992d1faa32d4fb6a659bf
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 49f40ab7c8 Change-Id: Ia08140c3362320a57fd3608147109dda3c26247d
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 49f40ab7c8 -s ours am skip reason: subject contains skip directive Change-Id: I44a60b3eb3b26a3c3f7f15da48186a82c918b36f
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I30168a0db73a6ab4edb9f271ee0e912ab892674f
2020-02-26Merge "Revert "Pin junit to Java language level 8.""Jerome Gaillard
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7 am: ed077a7e06 am: 0fad8265cd ↵Automerger Merge Worker
am: e8fb6fdb11 am: 025343e8b9 Change-Id: Ide33bf43b02a7db1e99d0658a4ec3fbe4a2957b8
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7 am: ed077a7e06 am: 0fad8265cd ↵Automerger Merge Worker
am: e8fb6fdb11 Change-Id: Id99df4ea5983c820b06bc977a725282994b74312
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7 am: ed077a7e06 am: 0fad8265cdAutomerger Merge Worker
Change-Id: I8873012c65dde9a4e95b3700473841928410adb8
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7 am: ed077a7e06Automerger Merge Worker
Change-Id: Ie0603bfb9c07642857f731907a073a1dc4f8fb2a
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7 am: ed077a7e06Automerger Merge Worker
Change-Id: I1736daf588c93b60d065aa936a0a7616ef620721
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I96d92457de3ad0fc0f6a389c5106e7d27350d5db
2020-02-25Merge "Add jgaillard to OWNERS"Treehugger Robot
2020-02-25Add jgaillard to OWNERSPaul Duffin
Test: m nothing Change-Id: I4114606985b6da7b5fdc9d910c7f38d637c0b8f3
2020-02-20Revert "Pin junit 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 2e771a25d8437246287c87d8045794c7f6968ec1. 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: I676b21082db284437c33993b133f48d930111ca2
2019-10-03Pin junit 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_r4android-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_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-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseandroid11-mainline-conscrypt-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releasePete 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: Iea6002318a446782d1cec38906ead4c247dab00c
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterq_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-r-preview-1android-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: 23d64d603c -s ours am skip reason: subject contains skip directive Change-Id: If3f3c971fe7a5365479a9f73043d474f23cf6ba9
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: I53f248679f38594622cb055a7a85c3f17f06c246
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: c1ef605003 -s ours am: 621f17ced7 -s ours am: d580604d38 -s ours Change-Id: Id429a81bdfaa3990a6ec0268369d9b0e58844d1d
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: c1ef605003 -s ours am: 621f17ced7 -s ours Change-Id: I6eac450a4b4d38d22dc137fdcd0d79bc621ee9ff
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 20:54:02 +0000