summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-09-20Remove external/ukey2/.gitmodules and submodule directories. am: e711039fa9 ↵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
am: 492edd667d am: fbfc8c2de3 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1830387 Change-Id: I39b782244d2516ef02aad5f9b23f49337033886b
2021-09-20Remove external/ukey2/.gitmodules and submodule directories. am: e711039fa9 ↵Raman Tenneti
am: 492edd667d Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1830387 Change-Id: Ib556b731106c01012ac82308f16d5d8c87736338
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
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1830387 Change-Id: I91219edd5fd1166e381d1e03ede194bd8fd8e49c
2021-09-17Remove external/ukey2/.gitmodules and submodule directories.Raman Tenneti
git doesn't support submodules in external directory. Bug: 152899985 Test: Presubmit-Verify Change-Id: I11401a848b6d3b87568c795cad3e3762eb256513
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f03303943a -s ↵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
ours am: c0f8bf627b -s ours am skip reason: Change-Id I2c2a81b364f8b636fd02db7923951c4da73731fd with SHA-1 fb49f0bc73 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I21a0aa1b6d1c0ca1d642d5a5f5fb6b23d715e49a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f03303943a -s oursXin Li
am skip reason: Change-Id I2c2a81b364f8b636fd02db7923951c4da73731fd with SHA-1 fb49f0bc73 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic736e989b6a14ec75173a4bf00e986ee59e7f3fd
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: I2c2a81b364f8b636fd02db7923951c4da73731fd Change-Id: I902548e770b4e3ed9bdc4ef12460f30bdcb346d9
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: ↵Elliott Hughes
77f068fc5a am: bd0ecf8534 am: 974bcc2830 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1579488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I91cc174d53d83378b55c71c0e3c49a195eabc967
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: ↵Elliott Hughes
77f068fc5a am: bd0ecf8534 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1579488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0872d0ae6854fd12e954d369e319fa96ed4dd02f
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 77f068fc5aElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1579488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1fda713b3e409263c3927bdb79c530052e9d86da
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymergeandroid-s-preview-1Elliott Hughes
Also fix METADATA to point to upstream so this project stays up to date. Bug: http://b/179674268 Test: treehugger Change-Id: I0a644fbb3688daec2565daa5d2cf530e15b68f9f
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9 am: ↵Bob Badour
281be9c6db am: 2e1f8ba69d Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1575972 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I69bc6dd2ab6fef71e73ad17d7b2b2aef3cb63321
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9 am: 281be9c6dbBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1575972 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae4676c5eb7368550765f7747499d8b2299fdd46
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1575972 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id55a38435c40539deb8ed4aa3948149f43f9c85b
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Idb9680f9037d6f99c780edc9ae9639391eb8d8da
2020-11-25Mark ab/6881855 as merged am: f19a71e27c am: fb49f0bc73Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ukey2/+/13109973 Change-Id: I5bb3f8fa8bfea698f7709c06e093257ad30e43db
2020-11-25Mark ab/6881855 as merged am: f19a71e27cXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ukey2/+/13109973 Change-Id: I2c2a81b364f8b636fd02db7923951c4da73731fd
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ia79df205ec3c568f3863f4273fb937d047677fbf
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491 am: 5b7b1e9c88 am: c2618c2887Erin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: Ie7fa00b0aeb9395a998455360119e26758e4cc17
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491 am: 5b7b1e9c88Erin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: I6815cdf3ee57071719925273b89affc1cc82e8b0
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491Erin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: I09f33b68004442fa4f3f628356b6fa36e8db18cd
2020-11-10Update ukey2 am: 1182deea1eErin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: Idddc0d0da99800fd4c1d074f8da11ef25eaab553
2020-11-09Update ukey2Erin Yan
This update is being pulled in from github https://github.com/google/ukey2 This update only includes java lib Bug: 172576615 Test: Build Change-Id: I7ee4375b7ed3c3908ec6672f529a88aa6080efb9
2020-07-06Merge pull request #6 from apolyudov/masterAlexei Czeskis
Roll forward to cl/319125760
2020-06-30Roll forward to cl/319125760Alexey Polyudov
Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: I948aa562e910c896aa7803c0ba275e8efa95804c
2020-06-22Merge pull request #4 from apolyudov/masterAlexei Czeskis
Bring ukey2 up-to-date with internal code
2020-06-22Switch securemessage submodule project to google/Alexey Polyudov
clean up gradle artifacts. add c++ test helper app. Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: I96cde0abe95a3a2995df23e0661058e4e650ae87
2020-06-22Bring ukey2 up-to-date with internal codeAlexey Polyudov
Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: Ie087ddaeef2c38f413484145114da7835c19f69b
2020-06-22Merge pull request #5 from apolyudov/javaAlexei Czeskis
Refresh Java code and proto files, add Java tests and enable standalo…
2020-06-22Refresh Java code and proto files, add Java tests and enable standalone java ↵Alexey Polyudov
build Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: Ic9f597ec66c57d468a5d90b4c0e05d430f4961db
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146d ↵Bob Badour
am: 9a70ed2e2e am: d0f5ee5f74 am: c553b6de7b Change-Id: I7efb326a0609b8af6fbe590b24cf2786f3a3f58d
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146d ↵Bob Badour
am: 9a70ed2e2e am: d0f5ee5f74 Change-Id: I4eb5187449e87ccb3106043b42fa82e0b760830c
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146d ↵Bob Badour
am: 9a70ed2e2e Change-Id: Ic588882bf5462dd3eca96f6f16a97281e559fd32
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146dBob Badour
Change-Id: I80f42435076ac7f1b850cd478fc90becee734fa5
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8android-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ib511caaa627b45578f69d5fd59aa98da3af3586f
2020-04-23Add license type: Apache2 is a NOTICE licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Id2a1aa4c050433cbbe3cf97b99a40a26bcb3978f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: acb7542149 -s ours am: 05c0545f9e am: 54ac245fd1 am: 7f3e670f6c -s ours am skip reason: subject contains skip directive Change-Id: I0b13464b153b7a03876e6405e41425ba4e78f497
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: acb7542149 -s ours am: 05c0545f9e am: 54ac245fd1 Change-Id: Ida477d3b5c48d622f4e8ae69e5b916d9ea046a05
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: acb7542149 -s ours am: 05c0545f9e Change-Id: Ia2177675d5fdd2000ef849ffab306d56fc659beb
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: acb7542149 -s ours am skip reason: subject contains skip directive Change-Id: I2aedff9d036143930c0137c1d509e88f521aced4
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I1328eca7fc69a6d31312912284b01f51f952d6e7
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: ↵Treehugger Robot
fb602f0c39 am: 4ef7ef48d2 am: 50be8d0faa am: 09d8be5862 Change-Id: Ia670ce65e7966f1f474985c09fe9c50f295df562
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: ↵Treehugger Robot
fb602f0c39 am: 4ef7ef48d2 am: 50be8d0faa Change-Id: I2047edea66f8f73628e9dda69522fb9103bf9a21
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: ↵Treehugger Robot
fb602f0c39 am: 4ef7ef48d2 Change-Id: If52b7b4a7e94e03a3769c5be2b214f2ecc04966f
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: ↵Treehugger Robot
fb602f0c39 Change-Id: Ib6ef5a4f55a58491dd38d45b3db7b2a51e7883eb
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: ↵Treehugger Robot
fb602f0c39 Change-Id: I3f23eddce2d14fdfb4e20d7ee6e8566e069466da
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6Treehugger Robot
Change-Id: If8fa2ce1a0d95a3b69362087a557ae10576b3fb5
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE."Treehugger Robot
2020-03-26Remove redundant NOTICE symbolic link. am: daa0a5190e am: c021c231a8 am: ↵Bob Badour
b1da275abc am: 888e08fa48 am: dc0d093f16 Change-Id: I0b5b14e68b592ef03aa8677826b36aab25353343
2020-03-26Remove redundant NOTICE symbolic link. am: daa0a5190e am: c021c231a8 am: ↵Bob Badour
b1da275abc am: 888e08fa48 Change-Id: Icecf9aea377fd6c7b63ff19f31c9156c2a68a5b4
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 12:30:13 +0000