aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-28Snap for 6439596 from 5a84b353bd7f8d67f506f245fcce1c5980e8e85d to ↵q_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_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-releaseandroid-build-team Robot
qt-aml-tzdata-release Change-Id: Ic980fc456eede20f0fba18ad5eee0d9236104e53
2019-11-11Snap for 6001391 from a4d04355bca412ff0f34cac2b5f26af2daab843d to ↵android-build-team Robot
qt-aml-tzdata-release Change-Id: I068f281839a4fae39807360110e2c9c964fc5719
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 852829233e Change-Id: I7059f579c07e609c7101acb8b950787d694780e1
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I2ec8f55d70b7a3d57e9575262b72f1149d60551c
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: b50d3b546aXin Li
am: ca8288ae35 Change-Id: If4b2d483beead8687a746436fbeb5c61015d6da5
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: b50d3b546a Change-Id: I78300f05118f0de9971cc328f47e279941905860
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
Bug: 141248619 Change-Id: I83cf6590c928e38b1aee4f7af5615243f04c15bb
2019-09-13Merge "Extend the Stress#mockALot() timeout for CTS." am: 14081cd0e4 am: ↵ke.zhao
e1a1eceb9a am: d8cf9a5c46 Change-Id: Icc97c3238c791bb08090f6c12adaac119082dad0
2019-09-13Merge "Extend the Stress#mockALot() timeout for CTS." am: 14081cd0e4ke.zhao
am: e1a1eceb9a Change-Id: I058b7ae8e8c57dccf966725ac0fcc42a88f963c1
2019-09-13Merge "Extend the Stress#mockALot() timeout for CTS."ke.zhao
am: 14081cd0e4 Change-Id: Id6d79d1b2182d06e6300e75a76adcbb8f490f316
2019-09-13Merge "Extend the Stress#mockALot() timeout for CTS."ndk-sysroot-r21Treehugger Robot
2019-09-12Extend the Stress#mockALot() timeout for CTS.ke.zhao
Low-performance phones may not be able to finish the test within 300s. Bug: 140516795 Test: OEM confirmed that they can pass CTS now. Change-Id: Iad30a8cb07b38054b490b7006d11908fc752a024
2019-09-10Merge changes from topic "mockito-dexmaker-update-revert" am: eb0ac321a9 am: ↵Garfield Tan
c48aee2265 am: 9c4802c87b Change-Id: Id930f285c0737f1fc4330c51b8a66a115753b307
2019-09-10Merge changes from topic "mockito-dexmaker-update-revert" am: eb0ac321a9Garfield Tan
am: c48aee2265 Change-Id: I02fc87043f3618bacf75df6603f0dee3c1add1d5
2019-09-10Merge changes from topic "mockito-dexmaker-update-revert"Garfield Tan
am: eb0ac321a9 Change-Id: If6cdea827953005ce0e1e50224b2b3f65c542398
2019-09-11Merge changes from topic "mockito-dexmaker-update-revert"Treehugger Robot
* changes: Reland "Update to Mockito 2.25.0 and impl InlineMockMaker." Reland "Restrict InspectClass to current thread." Revert "Update dexmaker to latest master."
2019-09-10Reland "Update to Mockito 2.25.0 and impl InlineMockMaker."Garfield Tan
This reverts commit af29ec14cc2419ba013ffd2f66ee26b5541d098d. Bug: 140773999 Test: Builds. Change-Id: I76ce490869000e95f62f7dc9ff0c8fa013dabc71
2019-09-10Reland "Restrict InspectClass to current thread."Garfield Tan
This reverts commit 4d7ae990719d81b616a08de466f9fcc043ec4d4a. Bug: 140773999 Test: Builds. Change-Id: I547bc175c0fb9da40c6336cb409e81042be16c6f
2019-09-10Revert "Update dexmaker to latest master."Garfield Tan
This reverts commit 239c31c6027c14879646948d62c6bbc6a886361d. Bug: 140773999 Test: Builds. Change-Id: Iaa46762ee841eb4a502439ce2c3534b1cc857d07
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 92b8670f8e -s ours am: 6c83dc864e -s ours am skip reason: change_id I764bd96abd906855d0ccd58cb5b02ab70cbf73c4 with SHA1 3a1b78751f is in history Change-Id: Iecdd1c1fbcc070728e1d74d8797560569468b4b1
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 92b8670f8e -s ours am skip reason: change_id I764bd96abd906855d0ccd58cb5b02ab70cbf73c4 with SHA1 3a1b78751f is in history Change-Id: I5eebdf571191e171e9339519775d04b53a0867f7
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I1dc80282e1b18e6ccbfb22102c812f8578d68b04 Merged-In: I764bd96abd906855d0ccd58cb5b02ab70cbf73c4
2019-09-06Merge changes from topic "update-mockito-dexmaker" am: e59c40a8cb am: ↵Garfield Tan
3a1b78751f am: 3c76f96cb1 am: f2248c8d19 Change-Id: Icf9f73c2e32e930845ea28e96fc52692773f94f7
2019-09-06Merge changes from topic "update-mockito-dexmaker" am: e59c40a8cb am: 3a1b78751fGarfield Tan
am: 3c76f96cb1 Change-Id: I592f9804c6ce79b7b023cdefb15a7d384fa4037d
2019-09-06Merge changes from topic "update-mockito-dexmaker" am: e59c40a8cbGarfield Tan
am: 3a1b78751f Change-Id: Ie29ea11fc3ab0043f8bab7bf243fa859622ce0b8
2019-09-06Merge changes from topic "update-mockito-dexmaker"Garfield Tan
am: e59c40a8cb Change-Id: I764bd96abd906855d0ccd58cb5b02ab70cbf73c4
2019-09-06Merge changes from topic "update-mockito-dexmaker"Garfield Tan
* changes: Update dexmaker to latest master. Revert "Restrict InspectClass to current thread." Revert "Update to Mockito 2.25.0 and impl InlineMockMaker."
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
8f74555e85 -s ours am: 8062ef81bb am: 04a9a30b41 Change-Id: I0bfa6f3e1051d48afcf78ff16caf334983a5f1df
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
8f74555e85 -s ours am: 8062ef81bb Change-Id: I3666885c8e28fcde7b10af8df68cd6d36ce9f4d8
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 8f74555e85 -s ours am skip reason: subject contains skip directive Change-Id: Ifbaa379b5c29da460f2073691de9fae64c35cd34
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I569a427aed8a79325d31f878ac90afb4d06ee3b0
2019-08-19Merge "Add additional owners" am: 1f92759998 am: e02f396584 am: 7a7f6fdbc9Philip P. Moltmann
am: 8b007e3d81 Change-Id: Ibcae42387bb412f99f0e73258f4d2425f4b0d48e
2019-08-19Merge "Add additional owners" am: 1f92759998 am: e02f396584Philip P. Moltmann
am: 7a7f6fdbc9 Change-Id: I19c353cf73c4202b8dfa0b8c1227d3cb723d0098
2019-08-19Merge "Add additional owners" am: 1f92759998Philip P. Moltmann
am: e02f396584 Change-Id: Ia275cd1c302c737477abe25547e5597a4e48de3c
2019-08-19Merge "Add additional owners"temp_140451723Philip P. Moltmann
am: 1f92759998 Change-Id: Ifb6bafaa738bc251c8da872d5780e3cf76637588
2019-08-19Merge "Add additional owners"Philip P. Moltmann
2019-08-16Add additional ownersPhilip P. Moltmann
Test: n/a Change-Id: I91aa9aa9bf0c2332abf6e8380c67335c96e7efbc
2019-08-16Update dexmaker to latest master.Garfield Tan
The new commit hash in upstream is c58ffebcbb2564c7d1fa6fb58b48f351c330296d. Bug: 138669713 Test: CtsMockingTestCases CtsInlineMockingTestCases CtsMockingDebuggableTestCases CtsExtendedMockingTestCases Change-Id: I2903728d7f4e13290e6e7cc9382b98e4b589cb8f
2019-08-16Revert "Restrict InspectClass to current thread."Garfield Tan
This reverts commit 929ab81fa3caa91f7db7f6818b55f27ca5de2a36. Bug: 138669713 Test: Builds. Change-Id: I48b8cd25a8f093d1e890134d19e81ecad37f9c12
2019-08-16Revert "Update to Mockito 2.25.0 and impl InlineMockMaker."Garfield Tan
This reverts commit 69d8fa5f4514491b819b183411c6dd5b6f713ffb. This is part of the following update. Bug: 138669713 Test: Builds. Change-Id: Ice6a07c17333d09b26c11abb5ca7b40fc79c5610
2019-08-15Merge "Update to Mockito 2.25.0 and impl InlineMockMaker." am: 6bf1ac9438 ↵Wale Ogunwale
am: 49e4e1885c am: 62d5f4708e am: 410679cc93 Change-Id: I2461f4448a424b0f9c0217affbca74f4fa40205a
2019-08-15Merge "Update to Mockito 2.25.0 and impl InlineMockMaker." am: 6bf1ac9438 ↵Wale Ogunwale
am: 49e4e1885c am: 62d5f4708e Change-Id: Icfec7c60b325fe1b820dbac9715734fddc8c08f7
2019-08-15Merge "Update to Mockito 2.25.0 and impl InlineMockMaker." am: 6bf1ac9438Wale Ogunwale
am: 49e4e1885c Change-Id: Ie4d5aec4f4d722c8a3eda4984ebb5ae72854f07e
2019-08-15Merge "Update to Mockito 2.25.0 and impl InlineMockMaker."Wale Ogunwale
am: 6bf1ac9438 Change-Id: I3c53b0ec9b5c28fc710656d2371afadc58ea0718
2019-08-15[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) into stage-aosp-master am: 76f54c2ecc -s ours am: 4e1aee6c9d am: 00f4028a4e Change-Id: Ie01747eec066996653920bc7ab688dbcfec2e1b5
2019-08-15[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) into stage-aosp-master am: 76f54c2ecc -s ours am: 4e1aee6c9d Change-Id: I9a9febf594f41e8989729e3ea7698be7022ddb74
2019-08-16Merge "Update to Mockito 2.25.0 and impl InlineMockMaker."Wale Ogunwale
2019-08-15[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) into stage-aosp-master am: 76f54c2ecc -s ours am skip reason: subject contains skip directive Change-Id: I7f13d840f793f40d2a399f10416243581e17d82f
2019-08-14DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I12beb682d09210099d207585fd4d61b70ef5c43b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 12:31:06 +0000