summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3be215e9f -s ↵android-vts-12.0_r2android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-cts-12.0_r2android-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-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: fcd9d3c3b4 -s ours am skip reason: Change-Id I417c8ee2fb2ff8d09b212071306c40305a12fbff with SHA-1 03629d722f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa2615e2a1d0361f6166c519b32a98c60a7c2f7b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3be215e9f -s oursXin Li
am skip reason: Change-Id I417c8ee2fb2ff8d09b212071306c40305a12fbff with SHA-1 03629d722f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If7ca5111cffd469ea0a5f93d62e7c15e4cdab2f1
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: I417c8ee2fb2ff8d09b212071306c40305a12fbff Change-Id: I5866c809aac9b22d09e52ff10dffc8c731d035aa
2020-11-24Mark ab/6881855 as merged am: 30cb2cc7d2 am: 03629d722fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/test/framework/+/13111562 Change-Id: I1f8824527ef30641d5e6ffe2d3d9208182ec13e7
2020-11-24Mark ab/6881855 as merged am: 30cb2cc7d2Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/test/framework/+/13111562 Change-Id: I417c8ee2fb2ff8d09b212071306c40305a12fbff
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I492622ab5bb2632ca4b0d52f190b1a09a63aa791
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6695bb55f0 -s ours am: ↵Xin Li
8bfbc5c05e -s ours am: dcd47e6186 -s ours am skip reason: Change-Id I44ba579366f67969db3af52673c33fce51b7da17 with SHA-1 7c026310b0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/test/framework/+/12797484 Change-Id: I18b0259782e55407a89312cc24b290cbf001190f
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6695bb55f0 -s ours am: ↵Xin Li
8bfbc5c05e -s ours am skip reason: Change-Id I44ba579366f67969db3af52673c33fce51b7da17 with SHA-1 7c026310b0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/test/framework/+/12797484 Change-Id: I8aea0bc05e9eda917041c408c0494bd58a0a1bea
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6695bb55f0 -s oursXin Li
am skip reason: Change-Id I44ba579366f67969db3af52673c33fce51b7da17 with SHA-1 7c026310b0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/test/framework/+/12797484 Change-Id: Ia07ea3ab266abd8aef6983c2d4d2632713bcf9d2
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I44ba579366f67969db3af52673c33fce51b7da17 Change-Id: Ibca760e4ef9cfe7be4e9c6fa6ee582507da5762f
2020-10-06Remove vtf related configs am: 376757b0ba am: 647713d162 am: 43e5702f3d am: ↵Dan Shi
25d86869b0 Original change: https://android-review.googlesource.com/c/platform/test/framework/+/1449375 Change-Id: Ia1020dfb78438091861e16d87a551f4262c769dd
2020-10-06Remove vtf related configs am: 376757b0ba am: 647713d162 am: 43e5702f3dDan Shi
Original change: https://android-review.googlesource.com/c/platform/test/framework/+/1449375 Change-Id: Ia9184def3c96ec0c9fb3da9498cfce6377effff5
2020-10-06Remove vtf related configs am: 376757b0ba am: 647713d162Dan Shi
Original change: https://android-review.googlesource.com/c/platform/test/framework/+/1449375 Change-Id: I4d35337d0992cb39fdb496ea3a73fad3aed99153
2020-10-06Remove vtf related configs am: 376757b0baDan Shi
Original change: https://android-review.googlesource.com/c/platform/test/framework/+/1449375 Change-Id: I2aeda2d153e34798028f2fa3c99ca7a34c74d98f
2020-10-05Remove vtf related configsDan Shi
Bug: 170120989 Test: build Change-Id: Icabf5247cd1e25db6f7800cfdb0a2a5b0b829e75
2020-07-10Delete hosttestlib am: 0690d5b557 am: 6b6f322891 am: 25ce77d194 am: ↵Julien Desprez
7c026310b0 am: 3fa4abcddc Original change: https://android-review.googlesource.com/c/platform/test/framework/+/1359743 Change-Id: I86f519831af157f2dc38215a860f43769e1f907f
2020-07-10Delete hosttestlib am: 0690d5b557 am: 6b6f322891 am: 25ce77d194 am: 7c026310b0Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/test/framework/+/1359743 Change-Id: I5e26fe3eba588679d44c6d896a81ecd01cbe30f7
2020-07-10Delete hosttestlib am: 0690d5b557 am: 6b6f322891 am: 25ce77d194Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/test/framework/+/1359743 Change-Id: I44ba579366f67969db3af52673c33fce51b7da17
2020-07-10Delete hosttestlib am: 0690d5b557 am: 6b6f322891Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/test/framework/+/1359743 Change-Id: If69956ed2895a9e89fa54abf4955335fd8329a87
2020-07-10Delete hosttestlib am: 0690d5b557Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/test/framework/+/1359743 Change-Id: I8fd418dc9d27ba5d6af9cbe27bdf7f4945529fb6
2020-07-09Delete hosttestlibandroid-r-beta-3android-r-beta-2Julien Desprez
Test: make Bug: 160907589 Change-Id: I030066be29a515db3c31c47dcf81ea916861f08e
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 98027f894c -s ours am: 64d1387b27 am: 2fe5174864 am: 3501bd1241 -s ours am skip reason: subject contains skip directive Change-Id: Id7482e533e8109beee0f239fe64103babb708fd8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 98027f894c -s ours am: 64d1387b27 am: 2fe5174864 Change-Id: Ife5a18637cfc4d400fe22e7145277934b20344c1
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 98027f894c -s ours am: 64d1387b27 Change-Id: If29d31cb7973af63adcb3d1c3b2be089fa6b61ae
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 98027f894c -s ours am skip reason: subject contains skip directive Change-Id: I7dce116aef5f0a7047c56e6e5605160305375fb8
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Id1939660cbd121b10c5cb8fcc516530fa4a55b66
2020-04-07[automerger skipped] Rename vts-core to vts am: 855d22f4c5 am: c76e4adfee ↵Dan Shi
am: c44480ac57 am: 8d7a23ccb4 -s ours am: ee6924243f -s ours am skip reason: Change-Id Ic62d47ccb1de83b79048154538163e9bc017156e with SHA-1 9910c35896 is in history Change-Id: Ib924cc17f70f350aa03fe95cc126e54f2a5289c8
2020-04-07[automerger skipped] Rename vts-core to vts am: 855d22f4c5 am: c76e4adfee ↵Dan Shi
am: c44480ac57 am: 8d7a23ccb4 -s ours am skip reason: Change-Id Ic62d47ccb1de83b79048154538163e9bc017156e with SHA-1 9910c35896 is in history Change-Id: I74b2c63ff27e30a7f886fa8273ccabf8fec93ecc
2020-04-07[automerger skipped] Rename vts-core to vts am: 855d22f4c5 -s ours am: ↵Dan Shi
1878705d89 -s ours am: 5a9c5da839 -s ours am: eed32337e0 -s ours am skip reason: Change-Id Ic62d47ccb1de83b79048154538163e9bc017156e with SHA-1 9910c35896 is in history Change-Id: Icd6c3508b97ee6facf80a1455a9d9cb088ee2bfb
2020-04-07[automerger skipped] Rename vts-core to vts am: 855d22f4c5 am: c76e4adfee -s ↵Dan Shi
ours am: 67fa9d70fe -s ours am: b5935b7c98 -s ours am skip reason: Change-Id Ic62d47ccb1de83b79048154538163e9bc017156e with SHA-1 9910c35896 is in history Change-Id: Ib1b1a8096c9550116352a331c28c44144ee3e471
2020-04-07Rename vts-core to vts am: 855d22f4c5 am: c76e4adfee am: c44480ac57Dan Shi
Change-Id: I7fab6785742037174a3f9ecf9991407cd1347adb
2020-04-07[automerger skipped] Rename vts-core to vts am: 855d22f4c5 -s ours am: ↵Dan Shi
1878705d89 -s ours am: 5a9c5da839 -s ours am skip reason: Change-Id Ic62d47ccb1de83b79048154538163e9bc017156e with SHA-1 9910c35896 is in history Change-Id: Ie7e5b249a2c4d6a6388bd2ebecf447a3ab0e7e3a
2020-04-07[automerger skipped] Rename vts-core to vts am: 855d22f4c5 am: c76e4adfee -s ↵Dan Shi
ours am: 67fa9d70fe -s ours am skip reason: Change-Id Ic62d47ccb1de83b79048154538163e9bc017156e with SHA-1 9910c35896 is in history Change-Id: Ia1b4f4c1b74bffa6777a3aaeb188cb58ffc8cb96
2020-04-07[automerger skipped] Rename vts-core to vts am: 855d22f4c5 -s ours am: ↵Dan Shi
1878705d89 -s ours am skip reason: Change-Id Ic62d47ccb1de83b79048154538163e9bc017156e with SHA-1 9910c35896 is in history Change-Id: I3d2fcb23762f66551bfaec2449da41c4faa9cdb6
2020-04-07Rename vts-core to vts am: 855d22f4c5 am: c76e4adfeeandroid-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_r18android11-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-d2-releaseDan Shi
Change-Id: I02f981524cfca16e2bda1a89dac8fb12de985f4a
2020-04-07[automerger skipped] Rename vts-core to vts am: 855d22f4c5 am: c76e4adfee -s ↵Dan Shi
ours am skip reason: Change-Id Ic62d47ccb1de83b79048154538163e9bc017156e with SHA-1 9910c35896 is in history Change-Id: Iff303a360eb95b45280b8ca0ec1dc7e6455f6d84
2020-04-07Rename vts-core to vts am: 855d22f4c5android-11.0.0_r16android11-d1-b-releaseDan Shi
Change-Id: I42c4e2a1623a2e3b807e72d7c53906011c45472b
2020-04-07[automerger skipped] Rename vts-core to vts am: 855d22f4c5 -s oursDan Shi
am skip reason: Change-Id Ib39db27f3e5c7bf56db571f0d651ffd3b59853a2 with SHA-1 77dc6ad27f is in history Change-Id: I5b3607ea493bc6805653c4f95c17306fe8948810
2020-04-06Rename vts-core to vtsandroid-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android11-mainline-tethering-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-devDan Shi
Bug: 151896491 Test: m -j vts Change-Id: I793c88b4b28909d59f44ecfb8466673c799b9702 Merged-In: Ic62d47ccb1de83b79048154538163e9bc017156e Merged-In: Ib39db27f3e5c7bf56db571f0d651ffd3b59853a2 Merged-In: Ifbdf05c4898723d5aea3daae21bdd5ee5620b7dc
2020-04-04Rename vts-core to vts am: 65b2d6afce am: e83a9a1909 am: 77dc6ad27f am: ↵Dan Shi
9910c35896 am: 6f22234109 Change-Id: I7e621a9ac2809d1d5f372dc5fd53f30c153d6f02
2020-04-04Rename vts-core to vts am: 65b2d6afce am: e83a9a1909 am: 77dc6ad27f am: ↵Dan Shi
9910c35896 Change-Id: Ifbdf05c4898723d5aea3daae21bdd5ee5620b7dc
2020-04-03Rename vts-core to vts am: 65b2d6afce am: e83a9a1909 am: 77dc6ad27fDan Shi
Change-Id: Ic62d47ccb1de83b79048154538163e9bc017156e
2020-04-03Rename vts-core to vts am: 65b2d6afce am: e83a9a1909Dan Shi
Change-Id: I248f21c87fc42e26e6b12a0f7c9e083ba2de79b9
2020-04-03Rename vts-core to vts am: 65b2d6afce am: e83a9a1909Dan Shi
Change-Id: Ib39db27f3e5c7bf56db571f0d651ffd3b59853a2
2020-04-03Rename vts-core to vts am: 65b2d6afceDan Shi
Change-Id: I6a7e4c26f4216d913eeb7a0f3c59ec2b151f5f46
2020-04-01Rename vts-core to vtsDan Shi
Bug: 151896491 Test: m -j vts Change-Id: I793c88b4b28909d59f44ecfb8466673c799b9702
2020-04-01[automerger skipped] Rename VTS to VTS10 am: 8d856815bf am: 4e68dfd373 am: ↵Dan Shi
8849e91580 am: 8e798906ef am: 2dbc23aee4 am: cf12a15027 am: eb1f9a0a0f am: 9be2fe7859 -s ours am: 5cb4f32deb -s ours am skip reason: Change-Id I7326a44102ce77e9ee2b785fa5fbf29c9fa150d8 with SHA-1 8849e91580 is in history Change-Id: Idc2d2f529466de4ce3b4b3cfab0f7d5642f73e77
2020-04-01[automerger skipped] Rename VTS to VTS10 am: 8d856815bf am: 4e68dfd373 am: ↵Dan Shi
8849e91580 am: 8e798906ef am: 2dbc23aee4 am: cf12a15027 am: eb1f9a0a0f am: 9be2fe7859 -s ours am skip reason: Change-Id I7326a44102ce77e9ee2b785fa5fbf29c9fa150d8 with SHA-1 8849e91580 is in history Change-Id: I78cc3876208a3850bfca81f46556f8cd5c7b3f39
2020-04-01Rename VTS to VTS10 am: 8d856815bf am: 4e68dfd373 am: 8849e91580 am: ↵Dan Shi
8e798906ef am: 2dbc23aee4 am: cf12a15027 am: eb1f9a0a0f Change-Id: I89d45894a4dde9a866167f97e72a168f35db65f0
2020-04-01[automerger skipped] Rename VTS to VTS10 am: 8d856815bf am: 4e68dfd373 am: ↵Dan Shi
8849e91580 am: 8e798906ef am: 2dbc23aee4 -s ours am: d5aaaea179 -s ours am: 4aba94eea9 -s ours am: 0ff7d585d9 -s ours am skip reason: Change-Id I7326a44102ce77e9ee2b785fa5fbf29c9fa150d8 with SHA-1 8849e91580 is in history Change-Id: Ibc9970783509679c9e70b8a5048afe765cc40727