summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/ex...staging/cm-13.0+r22Steve Kondik2016-03-100-0/+0
|\
| * keep history after reset to mnc-dr-devBaligh Uddin2016-01-250-0/+0
| |\
| | * DO NOT MERGE ANYWHERE Revert "Whitelist windows modules"Kenny Root2015-10-022-15/+13
| | * Merge mnc-dr-dev-plus-aosp into mnc-ub-devKenny Root2015-10-02455-26593/+23504
| | |\
| | | * am 3df15298: am 184bc934: BoringSSL: always build with symbol visibility flags.Adam Langley2015-09-251-6/+6
| | | |\
| | | | * am 184bc934: BoringSSL: always build with symbol visibility flags.Adam Langley2015-09-251-6/+6
| | | | |\
| | | | | * BoringSSL: always build with symbol visibility flags.Adam Langley2015-09-251-6/+6
| | | * | | am d947d006: am b8494591: Revert "Revert "external/boringssl: sync with upstr...Kenny Root2015-09-25450-26575/+23106
| | | |\ \ \ | | | | |/ /
| | | | * | am b8494591: Revert "Revert "external/boringssl: sync with upstream.""Kenny Root2015-09-25450-26575/+23106
| | | | |\ \ | | | | | |/
| | | | | * Revert "Revert "external/boringssl: sync with upstream.""Kenny Root2015-09-25450-26575/+23106
| | | * | | am 00bc53f6: am a04d78d3: Revert "external/boringssl: sync with upstream."Kenny Root2015-09-25450-23106/+26575
| | | |\ \ \ | | | | |/ /
| | | | * | am a04d78d3: Revert "external/boringssl: sync with upstream."Kenny Root2015-09-25450-23106/+26575
| | | | |\ \ | | | | | |/
| | | | | * Revert "external/boringssl: sync with upstream."Kenny Root2015-09-25450-23106/+26575
| | | * | | am 3781a606: am 1e4884f6: external/boringssl: sync with upstream.Adam Langley2015-09-24450-26575/+23106
| | | |\ \ \ | | | | |/ /
| | | | * | am 1e4884f6: external/boringssl: sync with upstream.Adam Langley2015-09-24450-26575/+23106
| | | | |\ \ | | | | | |/
| | | | | * external/boringssl: sync with upstream.Adam Langley2015-09-24450-26575/+23106
| | | * | | am 4ca36931: am 08656b61: Whitelist windows modulesDan Willemsen2015-09-032-13/+15
| | | |\ \ \ | | | | |/ /
| | | | * | am 08656b61: Whitelist windows modulesDan Willemsen2015-09-032-13/+15
| | | | |\ \ | | | | | |/
| | | | | * Whitelist windows modulesDan Willemsen2015-08-282-13/+15
| | | * | | am 929d45bb: (-s ours) am e25abed5: Fix and re-enable clang build.Dan Albert2015-08-270-0/+0
| | | |\ \ \ | | | | |/ /
| | | | * | am e25abed5: Fix and re-enable clang build.Dan Albert2015-08-151-12/+2
| | | | |\ \ | | | | | |/
| | | * | | am 5100c0f3: (-s ours) am 13204c36: Disable clang build temporarily to fix bu...Dan Albert2015-08-270-0/+0
| | | |\ \ \ | | | | |/ /
| | | | * | am 13204c36: Disable clang build temporarily to fix build.Dan Albert2015-08-151-6/+8
| | | | |\ \
| | | * | \ \ am 3b2c6065: (-s ours) am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5...Kenny Root2015-08-270-0/+0
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533Kenny Root2015-07-2420-433/+802
| | | | |\ \ \
| | | * | \ \ \ am e25abed5: Fix and re-enable clang build.Dan Albert2015-08-151-12/+2
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Fix and re-enable clang build.Dan Albert2015-08-141-12/+2
| | | | | |_|/ | | | | |/| |
| | | * | | | am 13204c36: Disable clang build temporarily to fix build.Dan Albert2015-08-151-6/+8
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Disable clang build temporarily to fix build.Dan Albert2015-08-141-6/+8
| | | | | |/ | | | | |/|
| | | * | | am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533Kenny Root2015-07-2420-433/+802
| | | |\ \ \ | | | | |/ / | | | | | / | | | | |/ | | | |/|
| | | | * Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533Kenny Root2015-07-2420-433/+802
| | | | |\
| | | | | * Handle RDRAND failures.Adam Langley2015-06-237-20/+200
| | | | | * dsa_pub_encode: Write out DSA parameters (p, q, g) in addition to key.Adam Langley2015-06-231-3/+19
| | | | | * Fix for CVE-2015-1789.Adam Langley2015-06-231-7/+47
| | | | | * Fixes for CVE-2015-1791.Adam Langley2015-06-2311-403/+536
| | | * | | am 71a0705e: Add a build target to build bssl for host.Narayan Kamath2015-07-041-0/+17
| | | |\ \ \ | | | | |/ /
| | | | * | Add a build target to build bssl for host.Narayan Kamath2015-06-241-0/+17
| | | | |/
| | | * | am 691ef9d0: am f7063c1e: Add rules.mk for building Trusty.Adam Langley2015-06-300-0/+0
| | | |\ \ | | | |/ / | | |/| |
| | * | | am f7063c1e: Add rules.mk for building Trusty.Adam Langley2015-06-301-0/+70
| | |\ \ \ | | |/ / / | |/| | |
| | | * | am f7fe69bb: am dfb3ba68: Add ECDHE-PSK-AES{128,256}-SHA cipher suites.Adam Langley2015-06-150-0/+0
| | | |\ \ | | | |/ / | | |/| |
| | * | | am dfb3ba68: Add ECDHE-PSK-AES{128,256}-SHA cipher suites.Adam Langley2015-06-155-1/+38
| | |\ \ \
| | | | * \ resolved conflicts for merge of 6d66cf82 to mnc-dev-plus-aospKenny Root2015-06-150-0/+0
| | | | |\ \ | | | |_|/ / | | |/| | |
| | * | | | am 4bae3aba: Drop ECDHE-PSK-AES-128-GCM.Adam Langley2015-06-154-23/+0
| | |\ \ \ \
| | | | | * \ am 0e6bb1c7: Add ECDHE-PSK-AES{128,256}-SHA cipher suites.Adam Langley2015-06-155-1/+38
| | | | | |\ \ | | | | | | |/
| | | | | | * Add ECDHE-PSK-AES{128,256}-SHA cipher suites.Adam Langley2015-06-155-1/+38
| | | | | * | am a4be71ce: Drop ECDHE-PSK-AES-128-GCM.Adam Langley2015-06-154-23/+0
| | | | | |\ \ | | | | | | |/
| | | | | | * Drop ECDHE-PSK-AES-128-GCM.Adam Langley2015-06-154-23/+0
| | | | | * | am 1f76c138: am dbfa1800: s/-Wno-unused-parameters/-Wno-unused-parameter/Adam Langley2015-06-120-0/+0
| | | | | |\ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | am dbfa1800: s/-Wno-unused-parameters/-Wno-unused-parameter/Adam Langley2015-06-121-9/+9
| | |\ \ \ \ \
| | | | | | * \ am 9701a2fb: am 53b272a2: Bump revision of BoringSSL.Adam Langley2015-06-120-0/+0
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | |
generated by cgit v1.1 at 2024-12-22 04:05:40 +0000