1. 41ee0a5 merge in lmp-mr1-release history after reset to 76406135cf3a3b88afc979fe8e847b9c3d8b93c1 by The Android Automerger · 10 years ago
  2. edf6c9c merge in lmp-release history after reset to 76406135cf3a3b88afc979fe8e847b9c3d8b93c1 by The Android Automerger · 10 years ago
  3. 42c9364 merge in lmp-release history after reset to 76406135cf3a3b88afc979fe8e847b9c3d8b93c1 by The Android Automerger · 10 years ago
  4. 4792beb merge in lmp-release history after reset to 16231d9e6236a181ac8f30895fd77eecde695b92 by The Android Automerger · 10 years ago
  5. 43fe6d8 merge in lmp-release history after reset to 76406135cf3a3b88afc979fe8e847b9c3d8b93c1 by The Android Automerger · 10 years ago
  6. 16231d9 merge in lmp-release history after reset to 76406135cf3a3b88afc979fe8e847b9c3d8b93c1 by The Android Automerger · 10 years ago
  7. 9023553 merge in lmp-release history after reset to 76406135cf3a3b88afc979fe8e847b9c3d8b93c1 by The Android Automerger · 10 years ago
  8. a1f171b merge in lmp-release history after reset to 76406135cf3a3b88afc979fe8e847b9c3d8b93c1 by The Android Automerger · 10 years ago
  9. ce232e3 merge in lmp-release history after reset to 76406135cf3a3b88afc979fe8e847b9c3d8b93c1 by The Android Automerger · 10 years ago
  10. 5d0c982 merge in lmp-release history after reset to 76406135cf3a3b88afc979fe8e847b9c3d8b93c1 by The Android Automerger · 10 years ago
  11. 93101a2 merge in lmp-release history after reset to 984b7ec6f5aab314117949a48e448ff4f6b65f16 by The Android Automerger · 10 years ago
  12. 7640613 am 6dcb23fe: am f427ec90: Fix the ENGINE_finish/ENGINE_free mixup by Kenny Root · 10 years ago
  13. 6dcb23f am f427ec90: Fix the ENGINE_finish/ENGINE_free mixup by Kenny Root · 10 years ago
  14. f427ec9 Fix the ENGINE_finish/ENGINE_free mixup by Kenny Root · 10 years ago
  15. 984b7ec Fix the ENGINE_finish/ENGINE_free mixup by Kenny Root · 10 years ago
  16. 5a8ca5b No need to select NPN protocols when not enabled by Kenny Root · 10 years ago
  17. a20d871 OpenSSLEngineImpl: reduce number of copies needed by Kenny Root · 10 years ago
  18. 4b050b6 OpenSSLSocketImpl: Move state checks inside mutex by Kenny Root · 10 years ago
  19. 1ffe43e Merge "Add possibility to get deleted system Certificate Aliases" into lmp-dev by Zoltan Szatmary-Ban · 10 years ago
  20. ad0cd83 Added CLOSED_INBOUND and CLOSED_OUTBOUND states to OpenSSLEngineImpl#getHandshakeStatus() by Prameet Shah · 10 years ago
  21. f11be68 Add possibility to get deleted system Certificate Aliases by Zoltan Szatmary-Ban · 10 years ago
  22. e427972 OpenSSLEngineImpl: fix unwrap behavior with array by Prameet Shah · 10 years ago
  23. affd45a Merge "Improve the Javadoc of PSKKeyManager." into lmp-dev by Alex Klyubin · 10 years ago
  24. 0d62d5f Improve the Javadoc of PSKKeyManager. by Alex Klyubin · 10 years ago
  25. af4fa68 Merge "Log CCS exceptions do not merge." into lmp-dev by rich cannings · 10 years ago
  26. 2e1be9d Log CCS exceptions do not merge. by rich cannings · 10 years ago
  27. a749c0d Keep enough state to completely reset cipher instances by Kenny Root · 10 years ago
  28. 70fdb6d OpenSSLEngine Impl: Fix bug where SSL Handshake never completes when using NPN. by Koushik Dutta · 10 years ago
  29. ded66f5 Various fixes in OpenSSLEngineImpl. by Koushik Dutta · 10 years ago
  30. fdb7d8c Enable PSK cipher suites when PSKKeyManager is provided. by Alex Klyubin · 10 years ago
  31. 6e2315f reconcile aosp (e79c25bf33e10da41e489c537823f678e1a1169c) after branching. Please do not merge. by Ed Heyl · 10 years ago
  32. a2404c9 am fe4a6df5: (-s ours) am a3284927: Remove by Brian Carlstrom · 10 years ago
  33. fe4a6df am a3284927: Remove by Brian Carlstrom · 10 years ago
  34. a328492 Remove by Brian Carlstrom · 10 years ago
  35. b860016 Remove by Brian Carlstrom · 10 years ago
  36. 6456f02 Revert "Log OpenSSL CCS errors" by Rich Cannings · 10 years ago
  37. b159952 Log OpenSSL CCS errors by rich cannings · 10 years ago
  38. 8f471e1 am dbc347b9: Merge "Remove direct reference to PROVIDER_NAME" by Kenny Root · 10 years ago
  39. 4f59b74 am d704c478: Merge "Assert that the padding extension is enabled by default." by Alex Klyubin · 10 years ago
  40. 13f0c44 am 35f7742c: Make setEnabledProtocols/CipherSuites copy their inputs. by Alex Klyubin · 10 years ago
  41. dbc347b Merge "Remove direct reference to PROVIDER_NAME" by Kenny Root · 10 years ago
  42. c59af1c Remove direct reference to PROVIDER_NAME by Kenny Root · 10 years ago
  43. d704c47 Merge "Assert that the padding extension is enabled by default." by Alex Klyubin · 10 years ago
  44. 507e074 Merge "Remove direct reference to PROVIDER_NAME" by Brian Carlstrom · 10 years ago
  45. 00ee7cc am 8f471e15: am dbc347b9: Merge "Remove direct reference to PROVIDER_NAME" by Kenny Root · 10 years ago
  46. 95cf6d9 Remove direct reference to PROVIDER_NAME by Kenny Root · 10 years ago
  47. dae700a am 4f59b745: am d704c478: Merge "Assert that the padding extension is enabled by default." by Alex Klyubin · 10 years ago
  48. dbe1cda am 13f0c44c: am 35f7742c: Make setEnabledProtocols/CipherSuites copy their inputs. by Alex Klyubin · 10 years ago
  49. 35f7742 Make setEnabledProtocols/CipherSuites copy their inputs. by Alex Klyubin · 10 years ago
  50. 53baf07 am c961c78c: am f17361e7: Remove unnecessary comments in SSLParametersImpl. by Alex Klyubin · 10 years ago
  51. c961c78 am f17361e7: Remove unnecessary comments in SSLParametersImpl. by Alex Klyubin · 10 years ago
  52. f17361e Remove unnecessary comments in SSLParametersImpl. by Alex Klyubin · 10 years ago
  53. cac0e43 am a906b5cc: am b2713e36: Merge "Adjust the list of supported ECDHE-PSK cipher suites." by Alex Klyubin · 10 years ago
  54. a906b5c am b2713e36: Merge "Adjust the list of supported ECDHE-PSK cipher suites." by Alex Klyubin · 10 years ago
  55. 4dc2f0b am 54e5afb0: am 8a624688: Merge "SSLParametersImpl is the source of enabled cipher suites and protocols." by Alex Klyubin · 10 years ago
  56. 978e2e1 Assert that the padding extension is enabled by default. by Alex Klyubin · 10 years ago
  57. 54e5afb am 8a624688: Merge "SSLParametersImpl is the source of enabled cipher suites and protocols." by Alex Klyubin · 10 years ago
  58. 8f30a41 am bf877901: am ecd29abc: Switch from core to core-libart by Brian Carlstrom · 10 years ago
  59. bf87790 am ecd29abc: Switch from core to core-libart by Brian Carlstrom · 10 years ago
  60. ecd29ab Switch from core to core-libart by Brian Carlstrom · 10 years ago
  61. 8a62468 Merge "SSLParametersImpl is the source of enabled cipher suites and protocols." by Alex Klyubin · 10 years ago
  62. b2713e3 Merge "Adjust the list of supported ECDHE-PSK cipher suites." by Alex Klyubin · 10 years ago
  63. b79411a Adjust the list of supported ECDHE-PSK cipher suites. by Alex Klyubin · 10 years ago
  64. c8fc022 am ff3c2044: am 69c36470: Use the new version of TLS Channel ID extension. by Alex Klyubin · 10 years ago
  65. ff3c204 am 69c36470: Use the new version of TLS Channel ID extension. by Alex Klyubin · 10 years ago
  66. 69c3647 Use the new version of TLS Channel ID extension. by Alex Klyubin · 10 years ago
  67. 7d48e43 am dea78c6f: am 90c92a2b: Merge "Add support for a Google Play Services version of the JNI lib" by Justin Morey · 10 years ago
  68. 4df44be am b4510b0f: am ea7cf2a1: Make TLS Channel ID tests use ECDHE_RSA key exchange. by Alex Klyubin · 10 years ago
  69. dea78c6 am 90c92a2b: Merge "Add support for a Google Play Services version of the JNI lib" by Justin Morey · 10 years ago
  70. b4510b0 am ea7cf2a1: Make TLS Channel ID tests use ECDHE_RSA key exchange. by Alex Klyubin · 10 years ago
  71. ea7cf2a Make TLS Channel ID tests use ECDHE_RSA key exchange. by Alex Klyubin · 10 years ago
  72. 6bfb072 am 23d99f15: am 1b60d4ff: Fix 64-bit build error. by Ian Rogers · 10 years ago
  73. 4e313b6 am fb07b3ce: am f24ba062: Add ability to wrap platform keys by Kenny Root · 10 years ago
  74. 3cb3621 am e553da19: am ba94b3df: Build conscrypt_unbundled using Gradle by Justin Morey · 10 years ago
  75. 2216398 am 3a698c26: am 47e40a5c: Move FileClientSessionCache to main directory by Georgi Nikolov · 10 years ago
  76. 23d99f1 am 1b60d4ff: Fix 64-bit build error. by Ian Rogers · 10 years ago
  77. 1b60d4f Fix 64-bit build error. by Ian Rogers · 10 years ago
  78. 350de20 am c7019557: am cc58989f: Merge "Remove deprecated WITH_HOST_DALVIK." by Ian Rogers · 10 years ago
  79. fb07b3c am f24ba062: Add ability to wrap platform keys by Kenny Root · 10 years ago
  80. f24ba06 Add ability to wrap platform keys by Kenny Root · 10 years ago
  81. e553da1 am ba94b3df: Build conscrypt_unbundled using Gradle by Justin Morey · 10 years ago
  82. 3a698c2 am 47e40a5c: Move FileClientSessionCache to main directory by Georgi Nikolov · 10 years ago
  83. ba94b3d Build conscrypt_unbundled using Gradle by Justin Morey · 10 years ago
  84. 47e40a5 Move FileClientSessionCache to main directory by Georgi Nikolov · 10 years ago
  85. 90c92a2 Merge "Add support for a Google Play Services version of the JNI lib" by Justin Morey · 10 years ago
  86. e66dbe5 Add support for a Google Play Services version of the JNI lib by Justin Morey · 10 years ago
  87. c701955 am cc58989f: Merge "Remove deprecated WITH_HOST_DALVIK." by Ian Rogers · 10 years ago
  88. cc58989 Merge "Remove deprecated WITH_HOST_DALVIK." by Ian Rogers · 10 years ago
  89. 600f747 am c5a998dd: am fee2d0f1: Add more debugging for getting methods by Kenny Root · 10 years ago
  90. c5a998d am fee2d0f1: Add more debugging for getting methods by Kenny Root · 10 years ago
  91. fee2d0f Add more debugging for getting methods by Kenny Root · 10 years ago
  92. 3a03c73 Remove deprecated WITH_HOST_DALVIK. by Ian Rogers · 10 years ago
  93. c9bc311 am 3483e223: am ff12765d: Make default user CA storage location configurable by Robin Lee · 10 years ago
  94. 3483e22 am ff12765d: Make default user CA storage location configurable by Robin Lee · 10 years ago
  95. b08adba am f69e50e6: merge in master-release history after reset to c4f9d7a56becd0eae97c91fcb9d3877b9fa041e6 by The Android Automerger · 10 years ago
  96. ff12765 Make default user CA storage location configurable by Robin Lee · 10 years ago
  97. 844ad93 am 77c5767b: am f92e61e2: Merge "Move platform-only files out to separate directory" by Kenny Root · 10 years ago
  98. 77c5767 am f92e61e2: Merge "Move platform-only files out to separate directory" by Kenny Root · 10 years ago
  99. f92e61e Merge "Move platform-only files out to separate directory" by Kenny Root · 10 years ago
  100. 39deada Move platform-only files out to separate directory by Kenny Root · 10 years ago