summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 4959036 from 18db382f11af3c80367c3c60a29ee41ddf3cb79b to mars...replicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004android-cts-6.0_r32marshmallow-cts-releaseandroid-build-prod (mdb)2018-08-165-17/+22
|\
| * Snap for 4959036 from 18db382f11af3c80367c3c60a29ee41ddf3cb79b to marshmallow...android-build-prod (mdb)2018-08-165-17/+22
|/|
| * Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r32" into marshmallow-c...Treehugger Robot2018-08-162-2/+2
| |\
| | * DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r32agowdra2018-08-162-2/+2
| |/
| * Merge "RESTRICT AUTOMERGE: CTS: Verify DynamicRefTable::load security fix" in...Treehugger Robot2018-08-143-15/+20
| |\
| | * RESTRICT AUTOMERGE: CTS: Verify DynamicRefTable::load security fixRyan Mitchell2018-08-083-15/+20
| |/
* | Merge "Snap for 4889949 from d333a47e1fb3cb06df73a80cd495be21cdea61bd to mars...android-cts-6.0_r31android-build-prod (mdb)2018-07-125-42/+18
|\ \
| * | Snap for 4889949 from d333a47e1fb3cb06df73a80cd495be21cdea61bd to marshmallow...android-build-prod (mdb)2018-07-125-42/+18
|/| | | |/
| * Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r31" into marshmallow-c...Treehugger Robot2018-07-122-2/+2
| |\
| | * DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r31agowdra2018-07-122-2/+2
| |/
| * Merge "DO NOT MERGE Rename testStagefright_b72165027 to meet naming standards...Treehugger Robot2018-07-111-1/+1
| |\
| | * DO NOT MERGE Rename testStagefright_b72165027 to meet naming standardsRay Essick2018-07-111-1/+1
| * | Merge "Remove testSecurityPatchDate as it is in GTS now." into marshmallow-ct...Treehugger Robot2018-07-111-32/+0
| |\ \ | | |/ | |/|
| | * Remove testSecurityPatchDate as it is in GTS now.JP Sugarbroad2018-07-111-32/+0
| |/
| * Merge "[automerger skipped] Merge "DO NOT MERGE - remove testStagefright_bug_...Android Merger2018-07-100-0/+0
| |\
| | * [automerger skipped] Merge "DO NOT MERGE - remove testStagefright_bug_3436059...Xiao Rui2018-07-100-0/+0
| |/|
| | * Merge "DO NOT MERGE - remove testStagefright_bug_34360591" into lollipop-mr1-...Treehugger Robot2018-07-102-4/+0
| | |\
| | | * DO NOT MERGE - remove testStagefright_bug_34360591Xiao Rui2018-06-192-4/+0
| | |/
| * | Merge "Make CTS test testQuery more flexible" into marshmallow-cts-devTreehugger Robot2018-06-201-7/+15
| |\ \
| | * | Make CTS test testQuery more flexibleFyodor Kupolov2018-06-151-7/+15
| |/ /
* | | Merge "Snap for 4841033 from 47e2366324a299e0a9b6d59d4df6d20bc328996b to mars...android-cts-6.0_r30android-build-prod (mdb)2018-06-1518-44/+243
|\ \ \
| * | | Snap for 4841033 from 47e2366324a299e0a9b6d59d4df6d20bc328996b to marshmallow...android-build-prod (mdb)2018-06-1518-44/+243
|/| | | | |/ /
| * | Merge "[DO NOT MERGE] Do not require hardware-bound RSA key support on M devi...Treehugger Robot2018-06-141-21/+2
| |\ \
| | * | [DO NOT MERGE] Do not require hardware-bound RSA key support on M devicesRubin Xu2018-05-241-21/+2
| * | | Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30" into marshmallow-c...Treehugger Robot2018-06-142-2/+2
| |\ \ \
| | * | | DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30agowdra2018-06-142-2/+2
| |/ / /
| * | | Merge "Check voice_recognizers feature before Assist test" into marshmallow-c...Treehugger Robot2018-06-125-8/+9
| |\ \ \
| | * | | Check voice_recognizers feature before Assist testIvan Izmailov2018-04-175-8/+9
| * | | | Merge "DO NOT MERGE: CTS test for Android Security b/62673179" into marshmall...Treehugger Robot2018-06-112-2/+7
| |\ \ \ \
| | * | | | DO NOT MERGE: CTS test for Android Security b/62673179Krishna C R2018-06-112-2/+7
| |/ / / /
| * | | | Merge changes from topic "m" into marshmallow-cts-devTreehugger Robot2018-06-113-0/+23
| |\ \ \ \
| | * | | | DO NOT MERGE: sonivox: fix hang caused by bad meta-event (cts)akirilov2018-06-112-0/+5
| | * | | | [DO NOT MERGE] CTS test for Android Security b/37093318Shrikara B2018-06-112-0/+18
| |/ / / /
| * | | | Merge "DO NOT MERGE: CTS: Created ResStringPool security tests" into marshmal...Treehugger Robot2018-06-113-0/+166
| |\ \ \ \
| | * | | | DO NOT MERGE: CTS: Created ResStringPool security testsy2018-06-113-0/+166
| |/ / / /
| * | | | Merge "Fix for testOnCannedTextResponsesLoaded" into marshmallow-cts-devTreehugger Robot2018-06-071-0/+6
| |\ \ \ \
| | * | | | Fix for testOnCannedTextResponsesLoadedRaj Mamadgi2018-06-011-0/+6
| * | | | | Merge "Avoid relying on undocumented behaviour in popup test." into marshmall...Treehugger Robot2018-06-071-8/+24
| |\ \ \ \ \
| | * | | | | Avoid relying on undocumented behaviour in popup test.Torne (Richard Coles)2018-05-301-8/+24
| * | | | | | Merge "[DO NOT MERGE] Remove backup/restore CTS tests on M" into marshmallow-...Treehugger Robot2018-05-317-750/+0
| |\ \ \ \ \ \
| | * | | | | | [DO NOT MERGE] Remove backup/restore CTS tests on MAnnie Meng2018-05-317-750/+0
| | |/ / / / /
| * | | | | | Merge "Skip UsbAccessory test on non-handheld devices" into marshmallow-cts-devTreehugger Robot2018-05-311-5/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Skip UsbAccessory test on non-handheld devicesIvan Izmailov2018-04-171-5/+6
| * | | | | | Merge "[DO NOT MERGE] Fix BackupRestoreHostSideTest on M" into marshmallow-ct...Treehugger Robot2018-05-291-31/+20
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [DO NOT MERGE] Fix BackupRestoreHostSideTest on MAnnie Meng2018-05-291-31/+20
| |/ / / / /
| * | | | | Merge "Adjusting ConnectivityScreenOff test for automotive" into marshmallow-...Treehugger Robot2018-05-174-24/+43
| |\ \ \ \ \
| | * | | | | Adjusting ConnectivityScreenOff test for automotiveIvan Izmailov2018-05-164-24/+43
* | | | | | | Merge "Merge cherrypicks of [697602, 697603, 697604] into marshmallow-cts-rel...android-cts-6.0_r29android-build-prod (mdb)2018-05-3111-785/+43
|\ \ \ \ \ \ \
| * | | | | | | Merge cherrypicks of [697602, 697603, 697604] into marshmallow-cts-releaseandroid-build-prod (mdb)2018-05-3111-785/+43
|/| | | | | | |
| * | | | | | | Merge "[DO NOT MERGE] Remove backup/restore CTS tests on M" into snap-temp-L7...android-build-prod (mdb)2018-05-317-750/+0
| |\ \ \ \ \ \ \