1. 9c28dd5 resolve merge conflicts of 0ab28b7 to nyc-mr1-dev-plus-aosp by Tucker Sylvestro · 8 years ago
  2. 0ab28b7 Support and use TAG_ALLOW_WHILE_ON_BODY by Tucker Sylvestro · 8 years ago
  3. ea2a494 Merge "keystore: fix memory leak from readKeymasterBlob" am: 3746fcf327 am: 1156db460e by Chad Brubaker · 8 years ago
  4. 178dca1 Merge "keystore: use static_cast for conversion between void* and uinti8_t*" am: e260a43a7e am: 0b7e649235 by Chad Brubaker · 8 years ago
  5. 72ab1f0 Merge "KeyCharacteristics implement Parcelable interface" am: 386ee11839 am: 468ddcb585 by Chad Brubaker · 8 years ago
  6. 9092847 Merge changes I6873ee37,Ia18ee6e4 am: 3ccb133274 am: 204e5eed73 am: 3aa6a436de by Chad Brubaker · 8 years ago
  7. ee9998b ExportResult implement Parcelable interface am: 96d62710a0 am: db6ccd4d03 by Bin Chen · 8 years ago
  8. 24db93b OperationResult implements Parcelable interface am: 9ec9270dbb am: 62e4fa28a9 by Bin Chen · 8 years ago
  9. fd05934 Merge "keystore: fix memory leak from readKeymasterBlob" am: 3746fcf327 by Chad Brubaker · 8 years ago
  10. eb44d81 Merge "keystore: use static_cast for conversion between void* and uinti8_t*" am: e260a43a7e by Chad Brubaker · 8 years ago
  11. 26457f4 Merge "KeyCharacteristics implement Parcelable interface" am: 386ee11839 by Chad Brubaker · 8 years ago
  12. 3aa6a43 Merge changes I6873ee37,Ia18ee6e4 am: 3ccb133274 am: 204e5eed73 by Chad Brubaker · 8 years ago
  13. e3b6e68 ExportResult implement Parcelable interface am: 96d62710a0 am: db6ccd4d03 by Bin Chen · 8 years ago
  14. 20f94c8 OperationResult implements Parcelable interface am: 9ec9270dbb am: 62e4fa28a9 by Bin Chen · 8 years ago
  15. 1156db4 Merge "keystore: fix memory leak from readKeymasterBlob" am: 3746fcf327 by Chad Brubaker · 8 years ago
  16. 0b7e649 Merge "keystore: use static_cast for conversion between void* and uinti8_t*" by Chad Brubaker · 8 years ago
  17. 468ddcb Merge "KeyCharacteristics implement Parcelable interface" am: 386ee11839 by Chad Brubaker · 8 years ago
  18. 204e5ee Merge changes I6873ee37,Ia18ee6e4 am: 3ccb133274 by Chad Brubaker · 8 years ago
  19. db6ccd4 ExportResult implement Parcelable interface am: 96d62710a0 by Bin Chen · 8 years ago
  20. 62e4fa2 OperationResult implements Parcelable interface am: 9ec9270dbb by Bin Chen · 8 years ago
  21. 3746fcf Merge "keystore: fix memory leak from readKeymasterBlob" by Chad Brubaker · 8 years ago
  22. e260a43 Merge "keystore: use static_cast for conversion between void* and uinti8_t*" by Chad Brubaker · 8 years ago
  23. 386ee11 Merge "KeyCharacteristics implement Parcelable interface" by Chad Brubaker · 8 years ago
  24. 3ccb133 Merge changes I6873ee37,Ia18ee6e4 by Chad Brubaker · 8 years ago
  25. 340cb95 Merge "Remove OpenSSL support" am: 9fae4d9945 am: aaf91922b6 am: f278613068 by Kenny Root · 8 years ago
  26. f278613 Merge "Remove OpenSSL support" am: 9fae4d9945 am: aaf91922b6 by Kenny Root · 8 years ago
  27. aaf9192 Merge "Remove OpenSSL support" am: 9fae4d9945 by Kenny Root · 8 years ago
  28. 9fae4d9 Merge "Remove OpenSSL support" by Treehugger Robot · 8 years ago
  29. ddf4742 Remove OpenSSL support by Kenny Root · 8 years ago
  30. 62ddfe0 keystore: fix memory leak from readKeymasterBlob by Bin Chen · 8 years ago
  31. 2cbb7ce keystore: use static_cast for conversion between void* and uinti8_t* by Bin Chen · 8 years ago
  32. 83e9c24 Merge "Reduce chance of zero-length keystore files" am: 71251eec8d am: 586a2dbf53 by Jacob Abrams · 8 years ago
  33. 57e65e2 Merge "Reduce chance of zero-length keystore files" am: 71251eec8d by Jacob Abrams · 8 years ago
  34. 586a2db Merge "Reduce chance of zero-length keystore files" am: 71251eec8d by Jacob Abrams · 8 years ago
  35. 71251ee Merge "Reduce chance of zero-length keystore files" by Treehugger Robot · 8 years ago
  36. 3b06f80 Reduce chance of zero-length keystore files by Jacob Abrams · 8 years ago
  37. 863f16f KeyCharacteristics implement Parcelable interface by Bin Chen · 8 years ago
  38. 96d6271 ExportResult implement Parcelable interface by Bin Chen · 8 years ago
  39. 9ec9270 OperationResult implements Parcelable interface by Bin Chen · 8 years ago
  40. 1f30270 Merge "keystore: replace VLA with vector" am: 9c6612e264 am: 451f205ba2 by Bin Chen · 8 years ago
  41. 87884b1 Merge "keystore: replace VLA with vector" am: 9c6612e264 am: 451f205ba2 by Bin Chen · 8 years ago
  42. 451f205 Merge "keystore: replace VLA with vector" am: 9c6612e264 by Bin Chen · 8 years ago
  43. 9c6612e Merge "keystore: replace VLA with vector" by Treehugger Robot · 8 years ago
  44. cfd95ae keystore: replace VLA with vector by Bin Chen · 8 years ago
  45. 63806d3 Merge \\\"Fix clang-tidy performance warnings in system/security.\\\" am: 4f987e61af am: acc171bee2 by Chih-Hung Hsieh · 8 years ago
  46. e2180dd Merge \\"Fix clang-tidy performance warnings in system/security.\\" am: 4f987e61af by Chih-hung Hsieh · 8 years ago
  47. acc171b Merge \"Fix clang-tidy performance warnings in system/security.\" am: 4f987e61af by Chih-Hung Hsieh · 8 years ago
  48. 4f987e6 Merge "Fix clang-tidy performance warnings in system/security." by Chih-hung Hsieh · 8 years ago
  49. 24b2a39 Fix clang-tidy performance warnings in system/security. by Chih-Hung Hsieh · 8 years ago
  50. bf14d3e Merge \\\"Fix google-explicit-constructor warnings in keystore.\\\" am: 590a1dade7 am: d62c7277dc by Chih-Hung Hsieh · 8 years ago
  51. d47b035 Merge \\"Fix google-explicit-constructor warnings in keystore.\\" am: 590a1dade7 by Chih-Hung Hsieh · 8 years ago
  52. d62c727 Merge \"Fix google-explicit-constructor warnings in keystore.\" am: 590a1dade7 by Chih-Hung Hsieh · 8 years ago
  53. 590a1da Merge "Fix google-explicit-constructor warnings in keystore." by Treehugger Robot · 8 years ago
  54. d7791be Fix google-explicit-constructor warnings in keystore. by Chih-Hung Hsieh · 8 years ago
  55. d735c26 Merge "Fix misc-macro-parentheses warnings." am: 8f8ed7f3f4 am: 4ca5d689be by Chih-Hung Hsieh · 8 years ago
  56. b8fdcc2 Merge "Fix misc-macro-parentheses warnings." am: 8f8ed7f3f4 am: 4ca5d689be by Chih-hung Hsieh · 8 years ago
  57. 4ca5d68 Merge "Fix misc-macro-parentheses warnings." am: 8f8ed7f3f4 by Chih-Hung Hsieh · 8 years ago
  58. 8f8ed7f Merge "Fix misc-macro-parentheses warnings." by Chih-hung Hsieh · 8 years ago
  59. 26275ad Fix misc-macro-parentheses warnings. by Chih-Hung Hsieh · 8 years ago
  60. 639746c Merge "Fix google-explicit-constructor warnings." am: e218406 am: e44c337 by Chih-Hung Hsieh · 8 years ago
  61. 9976622 Merge "Fix google-explicit-constructor warnings." am: e218406 am: e44c337 by Chih-hung Hsieh · 8 years ago
  62. e44c337 Merge "Fix google-explicit-constructor warnings." am: e218406 by Chih-Hung Hsieh · 8 years ago
  63. e218406 Merge "Fix google-explicit-constructor warnings." by Chih-hung Hsieh · 8 years ago
  64. d3bccc8 Fix google-explicit-constructor warnings. by Chih-Hung Hsieh · 8 years ago
  65. 6f4a37a Move keystore to foreground cpuset. am: 1140ef6 am: 37ca417 by Martijn Coenen · 8 years ago
  66. ec4eb75 Move keystore to foreground cpuset. am: 1140ef6 am: 3b7ab77 by Martijn Coenen · 8 years ago
  67. 3b7ab77 Move keystore to foreground cpuset. am: 1140ef6 by Martijn Coenen · 8 years ago
  68. 37ca417 Move keystore to foreground cpuset. am: 1140ef6 by Martijn Coenen · 8 years ago
  69. 1140ef6 Move keystore to foreground cpuset. by Martijn Coenen · 8 years ago
  70. e96063f Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp." am: 193059d by Shawn Willden · 8 years ago
  71. c5e91c2 Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp." am: 193059d by David Benjamin · 8 years ago
  72. 193059d Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp." by Shawn Willden · 8 years ago
  73. ff2e505 resolve merge conflicts of faac064 to nyc-dev-plus-aosp by Christopher Wiley · 8 years ago
  74. faac064 Merge "Export libbinder headers from libkeystore_binder" am: 52e5773 by Christopher Wiley · 8 years ago
  75. 52e5773 Merge "Export libbinder headers from libkeystore_binder" by Treehugger Robot · 8 years ago
  76. 955cd84 Export libbinder headers from libkeystore_binder by Christopher Wiley · 8 years ago
  77. 1239911 Implement key upgrade in keystore. am: 98c5916 by Shawn Willden · 8 years ago
  78. 15a89da Configure keymaster with OS version info. am: 814a6e7 by Shawn Willden · 8 years ago
  79. 98c5916 Implement key upgrade in keystore. by Shawn Willden · 8 years ago
  80. 814a6e7 Configure keymaster with OS version info. by Shawn Willden · 8 years ago
  81. 30c7752 Remove RSA_FLAG_EXT_PKEY from android_engine.cpp. by David Benjamin · 8 years ago
  82. 5a15c7e Fix AuthTokenTable tests. am: 47d2616 by Shawn Willden · 8 years ago
  83. 47d2616 Fix AuthTokenTable tests. by Shawn Willden · 8 years ago
  84. c7f0737 Merge "keystore_cli_v2: Update AES parameters" am: 0348d00 by Sourabh Banerjee · 8 years ago
  85. 0348d00 Merge "keystore_cli_v2: Update AES parameters" by Mohammed Habibulla · 8 years ago
  86. 250b40b keystore_cli_v2: Update AES parameters by Sourabh Banerjee · 8 years ago
  87. 799aec5 Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE." am: 6148b2043b by Darren Krahn · 8 years ago
  88. 29e2f1c Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE." am: 6148b2043b by Darren Krahn · 8 years ago
  89. 6148b20 Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE." by Darren Krahn · 8 years ago
  90. 01fc9a4 keystore_cli_v2: Removed test for KM_TAG_PURPOSE. by Darren Krahn · 8 years ago
  91. 0f93e78 Merge "keystore_cli_v2: Add support for testing against v0.3." am: 187b8f7a07 by Darren Krahn · 8 years ago
  92. 45ca6e5 Merge "keystore_cli_v2: Add support for testing against v0.3." am: 187b8f7a07 by Darren Krahn · 8 years ago
  93. 187b8f7 Merge "keystore_cli_v2: Add support for testing against v0.3." by Darren Krahn · 8 years ago
  94. fe37d0c Merge "Fix various memory errors." am: 29c54e37b2 am: 7388228191 by Shawn Willden · 8 years ago
  95. 7388228 Merge "Fix various memory errors." am: 29c54e37b2 by Shawn Willden · 8 years ago
  96. 82f4f5b keystore_cli_v2: Add support for testing against v0.3. by Darren Krahn · 8 years ago
  97. 29c54e3 Merge "Fix various memory errors." by Chih-hung Hsieh · 8 years ago
  98. eb1adaf Fix various memory errors. by Shawn Willden · 8 years ago
  99. 9d69b1b Merge "system/security/softkeymaster: don\'t pass a structure into |d2i_PrivateKey|." am: ec43173804 by Shawn Willden · 8 years ago
  100. 5e9794f Merge "system/security/softkeymaster: don\'t pass a structure into |d2i_PrivateKey|." by Shawn Willden · 8 years ago