aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-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_r12android10-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-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-240-0/+0
|\
| * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| |\
* | \ Add default active developers into OWNERS am: 6d6d58b0b7 am: 9cd3982734Chih-Hung Hsieh2019-01-071-0/+5
|\ \ \ | | |/ | |/|
| * | Add default active developers into OWNERS am: 6d6d58b0b7Chih-Hung Hsieh2019-01-071-0/+5
| |\|
| | * Add default active developers into OWNERSChih-Hung Hsieh2019-01-071-0/+5
| |/|
| | * Add default active developers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh2019-01-041-0/+5
| |/
* | Update package_path to use '_' instead of '-' so imports work. am: cb8ac95967...Kevin Cheng2018-07-091-1/+1
|\|
| * Update package_path to use '_' instead of '-' so imports work. am: cb8ac95967android-wear-8.0.0_r2Kevin Cheng2018-07-091-1/+1
| |\
| | * Update package_path to use '_' instead of '-' so imports work.master-cuttlefish-testing-releaseKevin Cheng2018-07-091-1/+1
| | |\
| | | * Update package_path to use '_' instead of '-' so imports work.android-p-preview-5Kevin Cheng2018-07-031-1/+1
* | | | Merge commit '5662c43' into pyasn1-modules_0.2.1 am: f2a0e87786 am: 8b7ce68755chojoyce2018-06-1366-0/+12599
|\| | |
| * | | Merge commit '5662c43' into pyasn1-modules_0.2.1 am: f2a0e87786chojoyce2018-06-1366-0/+12599
|/| | | | |/ /
| * / Merge commit '5662c43' into pyasn1-modules_0.2.1chojoyce2018-06-1366-0/+12599
|/| | | |/
| * Merge commit '5662c43' into pyasn1-modules_0.2.1android-p-preview-4chojoyce2018-06-1366-0/+12599
|/|
| * imports pep8'ed and optimizedIlya Etingof2017-11-2348-73/+239
| * Merge branch 'devel-0.2.1'Ilya Etingof2017-11-219-330/+411
| |\
| | * fixed OCSP ResponderID component taggingIlya Etingof2017-09-262-3/+4
| | * bump pyasn1 requirementsIlya Etingof2017-09-262-3/+3
| | * Merge branch 'open-types-support' into devel-0.2.1Ilya Etingof2017-09-177-327/+408
| | |\
| | | * properly ordered DER-encoded SET added to rfc2315 testsIlya Etingof2017-09-141-3/+3
| | | * Merge branch 'master' into open-types-supportIlya Etingof2017-09-142-23/+27
| | | |\
| | | * | WIP: open types supportIlya Etingof2017-09-134-114/+148
| | | * | Revert "temporary require specific github branch"Ilya Etingof2017-09-111-2/+1
| | | * | temporary require specific github branchIlya Etingof2017-09-101-1/+2
| | | * | WIP: open types supportIlya Etingof2017-09-104-277/+324
| * | | | 0.1.5Ilya Etingof2017-10-101-1/+1
| * | | | fixed OCSP ResponderID component taggingIlya Etingof2017-09-262-3/+4
| |/ / /
| * | / 0.1.5Ilya Etingof2017-09-151-1/+1
| | |/ | |/|
| * | OCSP response blob fixed in testIlya Etingof2017-09-143-24/+28
| |/
| * 0.1.4Ilya Etingof2017-09-073-2/+7
| * 0.1.3Ilya Etingof2017-09-075-15/+20
| * make patch version pinning operational with older PythonIlya Etingof2017-09-072-3/+10
| * pin to any pyasn1 patch releaseIlya Etingof2017-09-072-3/+3
| * 0.1.2Ilya Etingof2017-09-074-4/+9
| * pinned to pyasn1 0.3.3Ilya Etingof2017-08-272-3/+3
| * 0.1.1Ilya Etingof2017-08-271-1/+2
| * Merge pull request #6 from etingof/unit-testsIlya Etingof2017-08-0529-254/+849
| |\
| | * added coverage badgeIlya Etingof2017-08-051-0/+1
| | * travis updatedIlya Etingof2017-08-051-2/+3
| | * rfc2315 unit test improvedIlya Etingof2017-08-051-6/+68
| | * tests refactored into unit testsIlya Etingof2017-08-0527-195/+726
| |/
| * pin to pyasn1 0.3.2Ilya Etingof2017-08-042-3/+3
| * 0.0.11Ilya Etingof2017-08-042-7/+3
| * typo fixed in rfc2315Ilya Etingof2017-08-022-2/+2
| * Merge pull request #5 from fbvs/masterIlya Etingof2017-07-311-0/+2
| |\
| | * Add missing MAX.Francisco Santos2017-07-311-0/+2
| |/
| * OCSP BER substrate sample replaces with the DER oneIlya Etingof2017-07-291-22/+22
| * some more failing tests temporarily disabledIlya Etingof2017-07-271-1/+1
| * prepare for 0.0.11Ilya Etingof2017-07-272-1/+6
| * temporarily disable failing testsIlya Etingof2017-07-271-2/+6