summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-09-20Remove external/ukey2/.gitmodules and submodule directories. am: e711039fa9 a...android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Raman Tenneti
2021-09-20Remove external/ukey2/.gitmodules and submodule directories. am: e711039fa9 a...Raman Tenneti
2021-09-20Remove external/ukey2/.gitmodules and submodule directories. am: e711039fa9android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Raman Tenneti
2021-09-17Remove external/ukey2/.gitmodules and submodule directories.Raman Tenneti
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f03303943a -s ou...android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-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-releaseXin Li
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f03303943a -s oursXin Li
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
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 77f068fc...Elliott Hughes
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 77f068fc...Elliott Hughes
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 77f068fc5aElliott Hughes
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymergeandroid-s-preview-1Elliott Hughes
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9 am: 281be9c6db...Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9 am: 281be9c6dbBob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2Bob Badour
2020-11-25Mark ab/6881855 as merged am: f19a71e27c am: fb49f0bc73Xin Li
2020-11-25Mark ab/6881855 as merged am: f19a71e27cXin Li
2020-11-23Mark ab/6881855 as mergedXin Li
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491 am: 5b7b1e9c88 am: c2618c2887Erin Yan
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491 am: 5b7b1e9c88Erin Yan
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491Erin Yan
2020-11-10Update ukey2 am: 1182deea1eErin Yan
2020-11-09Update ukey2Erin Yan
2020-07-06Merge pull request #6 from apolyudov/masterAlexei Czeskis
2020-06-30Roll forward to cl/319125760Alexey Polyudov
2020-06-22Merge pull request #4 from apolyudov/masterAlexei Czeskis
2020-06-22Switch securemessage submodule project to google/Alexey Polyudov
2020-06-22Bring ukey2 up-to-date with internal codeAlexey Polyudov
2020-06-22Merge pull request #5 from apolyudov/javaAlexei Czeskis
2020-06-22Refresh Java code and proto files, add Java tests and enable standalone java ...Alexey Polyudov
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146d a...Bob Badour
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146d a...Bob Badour
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146d a...Bob Badour
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146dBob Badour
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8android-r-beta-3android-r-beta-2Bob Badour
2020-04-23Add license type: Apache2 is a NOTICE licenseBob Badour
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: fb602...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: fb602...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: fb602...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: fb602...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: fb602...Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6Treehugger Robot
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE."Treehugger Robot
2020-03-26Remove redundant NOTICE symbolic link. am: daa0a5190e am: c021c231a8 am: b1da...Bob Badour
2020-03-26Remove redundant NOTICE symbolic link. am: daa0a5190e am: c021c231a8 am: b1da...Bob Badour