aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android RHEADmasterXin Li2020-09-0830-184/+1167
|\
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-2730-184/+1167
|/|
| * Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge...josephjang2020-07-071-2/+4
| |\
| | * Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge...android11-devjosephjang2020-07-061-2/+4
| | |\
| | | * Identity: Add two paramter in ICsetAuthTokenRequestjosephjang2020-07-031-2/+4
| * | | Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge...josephjang2020-06-261-0/+17
| |\| |
| | * | Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge...josephjang2020-06-251-0/+17
| | |\|
| | | * CAVP: CMAC protosRoss Kettleson2020-06-181-0/+14
| | | * CAVP: Add CMAC proto, GCM success fieldRoss Kettleson2020-06-161-0/+3
| * | | Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge...josephjang2020-06-260-0/+0
| |\| |
| | * | Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge...josephjang2020-06-189-4/+711
| | |\ \
| * | \ \ Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge...josephjang2020-06-189-4/+711
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge...josephjang2020-06-169-4/+711
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge changes from topic "mDL on Citadel"Joseph Jang2020-06-127-0/+541
| | | |\
| | | | * Identity: Add support mDL certificate APIsjosephjang2020-06-081-0/+30
| | | | * identity: Create identity proto and app IDjosephjang2020-06-086-0/+511
| | | * | ALERT: refactor event_record struct optionRoss Kettleson2020-06-101-4/+7
| | | * | CAVP: ECDSA proto messagesRoss Kettleson2020-06-051-0/+59
| | | |/
| | | * CAVP: CKDF proto messagesRoss Kettleson2020-06-051-0/+13
| | | * CAVP: DRBG proto messagesRoss Kettleson2020-06-051-0/+19
| | | * CAVP: RSA proto messagesRoss Kettleson2020-06-031-0/+72
| * | | Merge remote-tracking branch 'goog/upstream-master' into dybertwang-nos-merge...dybertwang2020-06-180-0/+0
| |\| |
| | * | Merge remote-tracking branch 'goog/upstream-master' into dybertwang-nos-merge...dybertwang2020-06-0813-33/+173
| | |\ \
| * | | | Merge remote-tracking branch 'goog/upstream-master' into bill-rvc-06 am: 4738...Bill Richardson2020-06-180-0/+0
| |\| | |
| | * | | Merge remote-tracking branch 'goog/upstream-master' into bill-rvc-06 am: 4738...Bill Richardson2020-05-064-5/+25
| | |\ \ \
| * | | | | Merge remote-tracking branch 'goog/upstream-master' into wfrichar-MP-RVC-05 a...Bill Richardson2020-06-180-0/+0
| |\| | | |
| | * | | | Merge remote-tracking branch 'goog/upstream-master' into wfrichar-MP-RVC-05 a...Bill Richardson2020-04-1116-69/+126
| | |\ \ \ \
| * | | | | | Merge remote-tracking branch 'goog/upstream-master' into ngm-nos-merge-upstre...nagendra modadugu2020-06-180-0/+0
| |\| | | | |
| | * | | | | Merge remote-tracking branch 'goog/upstream-master' into ngm-nos-merge-upstre...nagendra modadugu2020-03-257-14/+93
| | |\ \ \ \ \
| * | | | | | | [automerger skipped] DO NOT MERGE: Merge remote-tracking branch 'goog/upstrea...Automerger Merge Worker2020-06-180-0/+0
| |\| | | | | |
| | * | | | | | [automerger skipped] DO NOT MERGE: Merge remote-tracking branch 'goog/upstrea...Automerger Merge Worker2020-03-040-0/+0
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ [automerger skipped] Merge QQ3A.200605.002 into master am: 393e0ef463 -s ours...Xin Li2020-06-080-0/+0
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | [automerger skipped] Merge QQ3A.200605.002 into master am: 393e0ef463 -s oursXin Li2020-06-080-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge QQ3A.200605.002 into masterandroid-r-beta-3android-r-beta-2Xin Li2020-06-032-5/+31
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'goog/upstream-master' into dybertwang-nos-merge...dybertwang2020-06-0813-33/+173
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | Merge remote-tracking branch 'goog/upstream-master' into dybertwang-nos-merge...dybertwang2020-06-0413-33/+173
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | / | | | | | |_|_|_|/ | | | | |/| | | |
| | | | * | | | | Merge "CAVP: SHA MCT proto messages"Ross Kettleson2020-06-031-0/+6
| | | | |\ \ \ \ \
| | | | | * | | | | CAVP: SHA MCT proto messagesRoss Kettleson2020-06-021-0/+6
| | | | * | | | | | Update OWNERS fileBill Richardson2020-06-031-3/+3
| | | | |/ / / / /
| | | | * | | | | Resume-on-Reboot: Citadel implementationKenny Root2020-06-013-0/+59
| | | | * | | | | CAVP: SHA MsgTest proto messageRoss Kettleson2020-05-181-0/+14
| | | | * | | | | CAVP: HMAC proto messagesRoss Kettleson2020-05-151-0/+21
| | | | * | | | | CAVP: Add AES-GCM proto messagesRoss Kettleson2020-05-131-0/+20
| | | | * | | | | CAVP: Define AES proto messagesRoss Kettleson2020-05-131-0/+27
| | | | * | | | | Only one WORKSPACE in entire repoKenny Root2020-05-016-30/+19
| | | | * | | | | Add NuggetClient constructor with const char* argBill Richardson2020-04-302-0/+4
| | * | | | | | | Merge remote-tracking branch 'goog/upstream-master' into bill-rvc-06 am: 4738...Bill Richardson2020-05-064-5/+25
| | |\| | | | | |
| | | * | | | | | Merge remote-tracking branch 'goog/upstream-master' into bill-rvc-06Bill Richardson2020-04-304-5/+25
| | | |\| | | | | | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | bazel: remove .bazelrc workaroundKenny Root2020-04-231-2/+0
| | | | * | | | Do not ignore subdirectory bazel filesKenny Root2020-04-171-1/+1