summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in lollipop-mr1-cts-release history after reset to lollipop-mr1-cts-devandroid-cts-5.1_r13gitbuildkicker2016-10-280-0/+0
|\
| * merge in lollipop-mr1-cts-release history after reset to lollipop-mr1-cts-devgitbuildkicker2016-09-040-0/+0
| |\
| | * Merge "DO NOT MERGE: bump cts to 5.1R10" into lollipop-mr1-cts-releaseDaniel Xie2016-07-201-1/+1
| | |\
| | | * DO NOT MERGE: bump cts to 5.1R10Daniel Xie2016-07-201-1/+1
| | |/
| | * Merge "DO NOT MERGE: bump cts to 5.1R10" into lollipop-mr1-cts-releaseDaniel Xie2016-07-201-1/+1
| | |\
| | | * DO NOT MERGE: bump cts to 5.1R10Daniel Xie2016-07-201-1/+1
| | |/
| | * Merge "DO NOT MERGE: Disable media encode/decode test." into lollipop-mr1-cts...android-cts-5.1_r9android-cts-5.1_r10Daniel Xie2016-07-111-0/+9
| | |\
| | | * DO NOT MERGE: Disable media encode/decode test.Daniel Xie2016-07-111-0/+9
| | |/
| | * merge in lollipop-mr1-cts-release history after reset to lollipop-mr1-cts-devThe Android Automerger2016-06-200-0/+0
| | |\
| | | * Merge "DO NOT MERGE ANYWHERE: Bump CTS to 5.1R8" into lollipop-mr1-cts-releaseandroid-cts-5.1_r8Daniel Xie2016-05-252-2/+2
| | | |\
| | | | * DO NOT MERGE ANYWHERE: Bump CTS to 5.1R8Daniel Xie2016-05-252-2/+2
| | | |/
| | | * merge in lollipop-mr1-cts-release history after reset to lollipop-mr1-cts-devThe Android Automerger2016-05-100-0/+0
| | | |\
| | | | * merge in lollipop-mr1-cts-release history after reset to lollipop-mr1-cts-devandroid-cts-5.1_r7The Android Automerger2016-04-190-0/+0
| | | | |\
| | | | | * Merge "DO NOT MERGE: fix another break" into lollipop-mr1-cts-releaseDaniel Xie2016-04-181-1/+1
| | | | | |\
| | | | | | * DO NOT MERGE: fix another breakDaniel Xie2016-04-181-1/+1
| | | | | |/
| | | | | * Merge "DO NOT MERGE: fixed breakage" into lollipop-mr1-cts-releaseDaniel Xie2016-04-171-1/+1
| | | | | |\
| | | | | | * DO NOT MERGE: fixed breakageDaniel Xie2016-04-171-1/+1
| | | | | |/
| | | | | * Merge "DO NOT MERGE: Remove testDumpProtected" into lollipop-mr1-cts-releaseDaniel Xie2016-04-171-0/+7
| | | | | |\
| | | | | | * DO NOT MERGE: Remove testDumpProtectedDaniel Xie2016-04-171-0/+7
| | | | | |/
| | | | | * Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R7" into lollipop-mr1-cts-releaseDaniel Xie2016-04-172-2/+2
| | | | | |\
| | | | | | * DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R7Daniel Xie2016-04-172-2/+2
| | | | | |/
| | | | | * merge in lollipop-mr1-cts-release history after reset to lollipop-mr1-cts-devThe Android Automerger2016-04-160-0/+0
| | | | | |\
| | | | | | * Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R6" into lollipop-mr1-cts-releaseandroid-cts-5.1_r6Daniel Xie2016-03-282-2/+2
| | | | | | |\
| | | | | | | * DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R6Daniel Xie2016-03-282-2/+2
| | | | | | |/
| | | | | | * Merge "DO NOT MERGE ANYWHERE: Disabling android.security.cts.StagefrightTest#...Daniel Xie2016-03-281-0/+7
| | | | | | |\
| | | | | | | * DO NOT MERGE ANYWHERE: DisablingDaniel Xie2016-03-281-0/+7
| | | | | | |/
| | | | | | * Merge "Using longer wavefile for Visualizer based Test" into lollipop-mr1-cts...Daniel Xie2016-03-252-1/+1
| | | | | | |\
| | | | | | | * Using longer wavefile for Visualizer based Testrago2016-03-252-1/+1
| | | | | | |/
| | | | | | * merge in lollipop-mr1-cts-release history after reset to lollipop-mr1-cts-devThe Android Automerger2016-03-150-0/+0
| | | | | | |\
| | | | | | | * Merge "DO NOT MEGE ANYWHERE: BUMP CTS 5.1 to R5" into lollipop-mr1-cts-releaseandroid-cts-5.1_r5Daniel Xie2016-02-032-2/+2
| | | | | | | |\
| | | | | | | | * DO NOT MEGE ANYWHERE: BUMP CTS 5.1 to R5Daniel Xie2016-02-032-2/+2
| | | | | | | |/
| | | | | | | * Merge "Fix monkey package test" into lollipop-mr1-cts-releaseDaniel Xie2016-01-251-9/+9
| | | | | | | |\
| | | | | | | | * Fix monkey package testNicholas Sauer2016-01-251-9/+9
| | | | | | | |/
| | | | | | | * Merge "MonkeyTests assertion failures errors. Limit the amount of error data ...Daniel Xie2016-01-251-6/+14
| | | | | | | |\
| | | | | | | | * MonkeyTests assertion failures errors.Nicholas Sauer2016-01-251-6/+14
| | | | | | | |/
* | | | | | | | Merge "DO NOT MERGE CTS 5.1_R13 release (Bump version to 5.1_r13)" into lolli...Tina Zhou2016-10-132-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | DO NOT MERGE CTS 5.1_R13 release (Bump version to 5.1_r13)tinazh2016-10-132-2/+2
|/ / / / / / / /
* | | | | | | | Merge "Fix STK CTS test failure" into lollipop-mr1-cts-devTina Zhou2016-10-131-2/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix STK CTS test failurefionaxu2016-09-281-2/+11
* | | | | | | | | Merge "TIF: Rename 'Fake' rating to 'Custom Rating'" into lollipop-mr1-cts-devTina Zhou2016-10-132-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | TIF: Rename 'Fake' rating to 'Custom Rating'Dongwon Kang2016-10-122-6/+6
| |/ / / / / / / /
* | | | | | | | | Merge "Fix SMSSendConfirmationCheck so that it doesnt fail on tablets or tv's...Tina Zhou2016-10-131-1/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix SMSSendConfirmationCheck so that it doesnt fail on tablets or tv'sBadash2016-10-041-1/+9
|/ / / / / / / /
* | | | | | | | Merge "Fix a memory corruption (NativeCodeTest testPipeReadV)" into lollipop-...Daniel Xie2016-09-131-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix a memory corruption (NativeCodeTest testPipeReadV)neo.chae2016-09-091-4/+2
* | | | | | | | | Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1R12" into lollipop-mr1-c...Daniel Xie2016-09-132-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | DO NOT MERGE: Bump CTS and CTS Verifier to 5.1R12Daniel Xie2016-09-132-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge "DO NOT MERGE: Add CTS for ExifInterfaceTest" into lollipop-mr1-cts-devDaniel Xie2016-09-126-0/+469
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | DO NOT MERGE: Add CTS for ExifInterfaceTestSungsoo Lim2016-09-126-0/+469
|/ / / / / / / /
* | | | | | | | Merge "Merge "Revert "DO NOT MERGE: Bump Cts to 5.0R10"" into lollipop-cts-de...Android Merger2016-09-070-0/+0
|\ \ \ \ \ \ \ \