1. 6a7210a am a4225912: am db39d382: am feb72fef: am 05e449a0: Merge "Correct double-convert from uid to userid" by Kenny Root · 9 years ago
  2. 1fdc9cd am 9d645b6b: am 69be6ebb: am f436a16b: am 50122db5: Correct double-convert from uid to userid by Robin Lee · 9 years ago
  3. a6ed0b7 am ed0ce5f2: am 0d0110ff: am 78c75ec5: am a6247469: Merge "keystore: allow system to clear keys even while encrypted" into lmp-dev by Kenny Root · 9 years ago
  4. 3f70b95 am c9e1e421: am fc14d612: am 27c27b70: am 931fac09: keystore: fully reset user keystore on request by Kenny Root · 9 years ago
  5. bd3c916 am 3f364298: am c9851e2b: am afe554a3: am cf5a7fc9: Merge "keystore: fully reset user keystore on request" by Kenny Root · 9 years ago
  6. 5264078 am bcc714f6: am f36b140f: am 4eaae5cc: am d5d811e4: Merge "keystore: allow system to clear keys even while encrypted" by Kenny Root · 9 years ago
  7. 6a29926 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/system/security into lmp-mr1-ub-dev by Geoff Mendal · 9 years ago
  8. 0facd63 am dbbc4082: am 9e0c0a78: am f583a75c: Merge "Comment out unused parameter." by Chih-Hung Hsieh · 9 years ago
  9. 83b5cba am 59ede656: am df697c4d: am b4918b9a: Build keystore in 32 bit on platforms that require it. by Shawn Willden · 9 years ago
  10. 6f31b67 am 3f798528: am fc5243db: am 4e865753: APIs for syncing password between profiles by Robin Lee · 9 years ago
  11. c338338 am 32630db1: am 481042fc: am 4a16cd72: Merge "Build keystore in 32 bit on platforms that require it." by Shawn Willden · 9 years ago
  12. a422591 am db39d382: am feb72fef: am 05e449a0: Merge "Correct double-convert from uid to userid" by Kenny Root · 9 years ago
  13. 9d645b6 am 69be6ebb: am f436a16b: am 50122db5: Correct double-convert from uid to userid by Robin Lee · 9 years ago
  14. ed0ce5f am 0d0110ff: am 78c75ec5: am a6247469: Merge "keystore: allow system to clear keys even while encrypted" into lmp-dev by Kenny Root · 9 years ago
  15. c9e1e42 am fc14d612: am 27c27b70: am 931fac09: keystore: fully reset user keystore on request by Kenny Root · 9 years ago
  16. 3f36429 am c9851e2b: am afe554a3: am cf5a7fc9: Merge "keystore: fully reset user keystore on request" by Kenny Root · 9 years ago
  17. bcc714f am f36b140f: am 4eaae5cc: am d5d811e4: Merge "keystore: allow system to clear keys even while encrypted" by Kenny Root · 9 years ago
  18. bb219bc am f44043da: am d020cf7f: am e3ec7541: Merge "Make client/app ids objects in the binder API" by Chad Brubaker · 9 years ago
  19. f44043d am d020cf7f: am e3ec7541: Merge "Make client/app ids objects in the binder API" by Chad Brubaker · 9 years ago
  20. d020cf7 am e3ec7541: Merge "Make client/app ids objects in the binder API" by Chad Brubaker · 9 years ago
  21. e3ec754 Merge "Make client/app ids objects in the binder API" by Chad Brubaker · 9 years ago
  22. 413b905 am a9ef7b1e: am 75cbb184: am dbddaad2: Merge "Add AuthTokenTable." by Shawn Willden · 9 years ago
  23. bc51718 am b3c00d6b: am fcd856db: am 9576d286: Merge "Add readByteArray" by Chad Brubaker · 9 years ago
  24. a9ef7b1 am 75cbb184: am dbddaad2: Merge "Add AuthTokenTable." by Shawn Willden · 9 years ago
  25. 75cbb18 am dbddaad2: Merge "Add AuthTokenTable." by Shawn Willden · 9 years ago
  26. dbddaad Merge "Add AuthTokenTable." by Shawn Willden · 9 years ago
  27. b3c00d6 am fcd856db: am 9576d286: Merge "Add readByteArray" by Chad Brubaker · 9 years ago
  28. d663442 Make client/app ids objects in the binder API by Chad Brubaker · 9 years ago
  29. 2ed2baa Add authorization binder methods by Chad Brubaker · 9 years ago
  30. fcd856d am 9576d286: Merge "Add readByteArray" by Chad Brubaker · 9 years ago
  31. 9576d28 Merge "Add readByteArray" by Chad Brubaker · 9 years ago
  32. 5ed1de8 am 1fed60b2: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. by Qiwen Zhao · 9 years ago
  33. 1fed60b reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. by Qiwen Zhao · 9 years ago
  34. 6432df7 Add readByteArray by Chad Brubaker · 9 years ago
  35. dbbc408 am 9e0c0a78: am f583a75c: Merge "Comment out unused parameter." by Chih-Hung Hsieh · 9 years ago
  36. 59ede65 am df697c4d: am b4918b9a: Build keystore in 32 bit on platforms that require it. by Shawn Willden · 9 years ago
  37. 3f79852 am fc5243db: am 4e865753: APIs for syncing password between profiles by Robin Lee · 9 years ago
  38. 32630db am 481042fc: am 4a16cd72: Merge "Build keystore in 32 bit on platforms that require it." by Shawn Willden · 9 years ago
  39. db39d38 am feb72fef: am 05e449a0: Merge "Correct double-convert from uid to userid" by Kenny Root · 9 years ago
  40. 69be6eb am f436a16b: am 50122db5: Correct double-convert from uid to userid by Robin Lee · 9 years ago
  41. 0d0110f am 78c75ec5: am a6247469: Merge "keystore: allow system to clear keys even while encrypted" into lmp-dev by Kenny Root · 9 years ago
  42. fc14d61 am 27c27b70: am 931fac09: keystore: fully reset user keystore on request by Kenny Root · 9 years ago
  43. c9851e2 am afe554a3: am cf5a7fc9: Merge "keystore: fully reset user keystore on request" by Kenny Root · 9 years ago
  44. f36b140 am 4eaae5cc: am d5d811e4: Merge "keystore: allow system to clear keys even while encrypted" by Kenny Root · 9 years ago
  45. c3a1856 Include operation handle in OperationResult by Chad Brubaker · 9 years ago
  46. cbb7251 am 5bc9b5c2: am 9aec38fb: Merge "Fix memory leak in keymaster_openssl." by Shawn Willden · 9 years ago
  47. 5bc9b5c am 9aec38fb: Merge "Fix memory leak in keymaster_openssl." by Shawn Willden · 9 years ago
  48. 9aec38f Merge "Fix memory leak in keymaster_openssl." by Shawn Willden · 9 years ago
  49. 489dfe1 Add AuthTokenTable. by Shawn Willden · 9 years ago
  50. 461d97e Fix memory leak in keymaster_openssl. by Shawn Willden · 9 years ago
  51. 47f8edd am bf9efff8: am 3bfd091a: Merge "Implement keymaster 1.0 crypto operations" by Alex Klyubin · 9 years ago
  52. e4af5e6 am 6ee02f24: am f394e372: Merge "Implement keymaster 1.0 export_key method" by Chad Brubaker · 9 years ago
  53. bf9efff am 3bfd091a: Merge "Implement keymaster 1.0 crypto operations" by Alex Klyubin · 9 years ago
  54. 6ee02f2 am f394e372: Merge "Implement keymaster 1.0 export_key method" by Chad Brubaker · 9 years ago
  55. 3bfd091 Merge "Implement keymaster 1.0 crypto operations" by Alex Klyubin · 9 years ago
  56. 944befb am 86466698: am b4e09c2d: Merge "Implement keymaster 1.0 import_key method" by Chad Brubaker · 9 years ago
  57. f394e37 Merge "Implement keymaster 1.0 export_key method" by Chad Brubaker · 9 years ago
  58. 8646669 am b4e09c2d: Merge "Implement keymaster 1.0 import_key method" by Chad Brubaker · 9 years ago
  59. b4e09c2 Merge "Implement keymaster 1.0 import_key method" by Chad Brubaker · 9 years ago
  60. 40a1a9b Implement keymaster 1.0 crypto operations by Chad Brubaker · 9 years ago
  61. 07b0cda Implement keymaster 1.0 export_key method by Chad Brubaker · 9 years ago
  62. 4c353cb Implement keymaster 1.0 import_key method by Chad Brubaker · 9 years ago
  63. d38f53e am e40d4397: am 7d211c09: Merge "Add -Wunused to keystore" by Chad Brubaker · 9 years ago
  64. 49185e7 am 2ca97bcd: am af3e993d: Merge "Implement keymaster 1.0 get_key_characteristics method" by Chad Brubaker · 9 years ago
  65. e40d439 am 7d211c09: Merge "Add -Wunused to keystore" by Chad Brubaker · 9 years ago
  66. 2ca97bc am af3e993d: Merge "Implement keymaster 1.0 get_key_characteristics method" by Chad Brubaker · 9 years ago
  67. 7d211c0 Merge "Add -Wunused to keystore" by Chad Brubaker · 9 years ago
  68. af3e993 Merge "Implement keymaster 1.0 get_key_characteristics method" by Chad Brubaker · 9 years ago
  69. f06a453 am 48c45fec: am f24ee2bb: Merge "Removed unused variables" by Chad Brubaker · 9 years ago
  70. 61c5884 Add -Wunused to keystore by Chad Brubaker · 9 years ago
  71. 48c45fe am f24ee2bb: Merge "Removed unused variables" by Chad Brubaker · 9 years ago
  72. f24ee2b Merge "Removed unused variables" by Chad Brubaker · 9 years ago
  73. db38ca0 Removed unused variables by Chad Brubaker · 9 years ago
  74. 9c9cb2f am fc0bc737: am 1bc16e46: Merge "Implement keymaster 1.0 generate_key method" by Chad Brubaker · 9 years ago
  75. fc0bc73 am 1bc16e46: Merge "Implement keymaster 1.0 generate_key method" by Chad Brubaker · 9 years ago
  76. 1bc16e4 Merge "Implement keymaster 1.0 generate_key method" by Chad Brubaker · 9 years ago
  77. 9abbb20 am 24ccd8ac: am 33ff863f: Merge "keystore-engine: Restore module path" by Kenny Root · 9 years ago
  78. 6cce2c3 am 629d2d27: am f9a96d81: am b0f70423: Merge "Implement keymaster 1.0 add_rng_entropy" by Chad Brubaker · 9 years ago
  79. 24ccd8a am 33ff863f: Merge "keystore-engine: Restore module path" by Kenny Root · 9 years ago
  80. 33ff863 Merge "keystore-engine: Restore module path" by Kenny Root · 9 years ago
  81. de7d734 keystore-engine: Restore module path by Kenny Root · 9 years ago
  82. 67d2a50 Revert "Fix build: Revert "Use keymaster 1.0 softkeymaster"" by Chad Brubaker · 9 years ago
  83. f3f071f Implement keymaster 1.0 get_key_characteristics method by Chad Brubaker · 9 years ago
  84. 17d68b9 Implement keymaster 1.0 generate_key method by Chad Brubaker · 9 years ago
  85. d48cb24 Fix build: Revert "Use keymaster 1.0 softkeymaster" by Ed Heyl · 9 years ago
  86. 629d2d2 am f9a96d81: am b0f70423: Merge "Implement keymaster 1.0 add_rng_entropy" by Chad Brubaker · 9 years ago
  87. f9a96d8 am b0f70423: Merge "Implement keymaster 1.0 add_rng_entropy" by Chad Brubaker · 9 years ago
  88. b0f7042 Merge "Implement keymaster 1.0 add_rng_entropy" by Chad Brubaker · 9 years ago
  89. a909f80 am 0d03a496: am bb196a1b: am 1b0fbce9: Merge "Use keymaster 1.0 softkeymaster" by Chad Brubaker · 9 years ago
  90. 9c8612c Implement keymaster 1.0 add_rng_entropy by Chad Brubaker · 9 years ago
  91. 0d03a49 am bb196a1b: am 1b0fbce9: Merge "Use keymaster 1.0 softkeymaster" by Chad Brubaker · 9 years ago
  92. bb196a1 am 1b0fbce9: Merge "Use keymaster 1.0 softkeymaster" by Chad Brubaker · 9 years ago
  93. 1b0fbce Merge "Use keymaster 1.0 softkeymaster" by Chad Brubaker · 9 years ago
  94. efd601b resolved conflicts for merge of 41ceb7db to master by Chad Brubaker · 9 years ago
  95. 41ceb7d am f1171da9: am ad4661a0: Merge "Add Keymaster 1.0 binder methods" by Chad Brubaker · 9 years ago
  96. f1171da am ad4661a0: Merge "Add Keymaster 1.0 binder methods" by Chad Brubaker · 9 years ago
  97. ad4661a Merge "Add Keymaster 1.0 binder methods" by Chad Brubaker · 9 years ago
  98. 919cb2a Use keymaster 1.0 softkeymaster by Chad Brubaker · 9 years ago
  99. 1d48298 am c451fe04: (-s ours) am 056ef407: am b060ae05: Merge "Revert "Add Keymaster 0.4 binder methods"" by Chad Brubaker · 9 years ago
  100. 8529cad am 0831dea5: (-s ours) am dfe0a1a5: am d7d51a60: Merge "Revert "Remove incorrect return value read"" by Chad Brubaker · 9 years ago