- 50122db Correct double-convert from uid to userid by Robin Lee · 12 years ago
- a624746 Merge "keystore: allow system to clear keys even while encrypted" into lmp-dev by Kenny Root · 12 years ago
- 931fac0 keystore: fully reset user keystore on request by Kenny Root · 12 years ago
- 007cb23 keystore: allow system to clear keys even while encrypted by Kenny Root · 12 years ago
- e193741 am 00b27fc4: am 0387a7fd: Merge "Add calls for SELinux MAC checks in keystore." by Nick Kralevich · 12 years ago
- 00b27fc am 0387a7fd: Merge "Add calls for SELinux MAC checks in keystore." by Nick Kralevich · 12 years ago
- 972ca01 am 1bed3f00: am 9421618b: Merge "Revert "Add calls for SELinux MAC checks in keystore."" by Nick Kralevich · 12 years ago
- 1bed3f0 am 9421618b: Merge "Revert "Add calls for SELinux MAC checks in keystore."" by Nick Kralevich · 12 years ago
- 9421618 Merge "Revert "Add calls for SELinux MAC checks in keystore."" by Nick Kralevich · 12 years ago
- 66dbf67 Revert "Add calls for SELinux MAC checks in keystore." by Nick Kralevich · 12 years ago
- 3e65df3 am e24fbbae: am bbf064bb: Merge "Add calls for SELinux MAC checks in keystore." by Nick Kralevich · 12 years ago
- e24fbba am bbf064bb: Merge "Add calls for SELinux MAC checks in keystore." by Nick Kralevich · 12 years ago
- 0387a7f Merge "Add calls for SELinux MAC checks in keystore." by Nick Kralevich · 12 years ago
- eaabae9 Add calls for SELinux MAC checks in keystore. by Riley Spahn · 12 years ago
- bbf064b Merge "Add calls for SELinux MAC checks in keystore." by Nick Kralevich · 12 years ago
- 0e542d0 Add calls for SELinux MAC checks in keystore. by Riley Spahn · 12 years ago
- 4112650 am d776bbd5: am 4bbc12a0: Merge "Fix softkeymaster EC group memory leak." by Shawn Willden · 12 years ago
- d776bbd am 4bbc12a0: Merge "Fix softkeymaster EC group memory leak." by Shawn Willden · 12 years ago
- 4bbc12a Merge "Fix softkeymaster EC group memory leak." by Shawn Willden · 12 years ago
- 99f8b20 am 35dadbc8: am 9f64567d: Merge changes Icb667451,Ie08d910b by Shawn Willden · 12 years ago
- 35dadbc am 9f64567d: Merge changes Icb667451,Ie08d910b by Shawn Willden · 12 years ago
- 9f64567 Merge changes Icb667451,Ie08d910b by Shawn Willden · 12 years ago
- 5cced14 am 9ee34c2f: am f7386706: Merge "Reformat software keymaster with clang-format." by Shawn Willden · 12 years ago
- 18a00e1 Fix softkeymaster EC group memory leak. by Shawn Willden · 12 years ago
- 2cd28fa Use template instead of macro to release UniquePtrs. by Shawn Willden · 12 years ago
- 8d0531e Make usage of new/delete and malloc/free consistent. by Shawn Willden · 12 years ago
- 9ee34c2 am f7386706: Merge "Reformat software keymaster with clang-format." by Shawn Willden · 12 years ago
- f738670 Merge "Reformat software keymaster with clang-format." by Shawn Willden · 12 years ago
- 1406b8a Reformat software keymaster with clang-format. by Shawn Willden · 12 years ago
- b2725a5 merge in master-release history after reset to 12b9921e52e28d4b1ea0d786ee81fbaa5f2fb923 by The Android Automerger · 12 years ago
- c3f5ad1 merge in master-release history after reset to 12b9921e52e28d4b1ea0d786ee81fbaa5f2fb923 by The Android Automerger · 12 years ago
- 971edfa merge in master-release history after reset to 12b9921e52e28d4b1ea0d786ee81fbaa5f2fb923 by The Android Automerger · 12 years ago
- 12b9921 Revert "Reformat software keymaster with clang-format." by Kenny Root · 12 years ago
- 152a028 merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- 299bc1c merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- 9e5b83c merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- f46ead5 merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- 33ddab8 Reformat software keymaster with clang-format. by Shawn Willden · 12 years ago
- 360cdbd merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- cb1ee6e merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- d05e93d merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- beac048 merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- 78b5fcb merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- 3469d16 merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- 15100f0 merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a by The Android Automerger · 12 years ago
- 1d4d33b am 3080ea76: am fba667fc: am bb15653d: Merge "Add support for specifying which key types are supported" by Kenny Root · 12 years ago
- 3080ea7 am fba667fc: am bb15653d: Merge "Add support for specifying which key types are supported" by Kenny Root · 12 years ago
- 48c6b88 Add support for specifying which key types are supported by Kenny Root · 12 years ago
- 7f67baf Add support for specifying which key types are supported by Kenny Root · 12 years ago
- fba667f am bb15653d: Merge "Add support for specifying which key types are supported" by Kenny Root · 12 years ago
- bb15653 Merge "Add support for specifying which key types are supported" by Kenny Root · 12 years ago
- 1d448c0 Add support for specifying which key types are supported by Kenny Root · 12 years ago
- c30aaf8 am a7700b73: am 9ffe9be8: Merge "Fix the Vector erase bug" by Kenny Root · 12 years ago
- 6d39020 am b2197930: am afd75728: Merge "keystore: fix errors inside ALOGV" by Colin Cross · 12 years ago
- a7700b7 am 9ffe9be8: Merge "Fix the Vector erase bug" by Kenny Root · 12 years ago
- 279e5d5 am 9ffe9be8: Merge "Fix the Vector erase bug" by Kenny Root · 12 years ago
- 9ffe9be Merge "Fix the Vector erase bug" by Kenny Root · 12 years ago
- b219793 am afd75728: Merge "keystore: fix errors inside ALOGV" by Colin Cross · 12 years ago
- db1b8f1 am afd75728: Merge "keystore: fix errors inside ALOGV" by Colin Cross · 12 years ago
- afd7572 Merge "keystore: fix errors inside ALOGV" by Colin Cross · 12 years ago
- 20e90ad keystore: fix errors inside ALOGV by Colin Cross · 12 years ago
- 8f7f962 am 495a95d4: Merge "system/security: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" by Colin Cross · 12 years ago
- 495a95d Merge "system/security: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" by Colin Cross · 12 years ago
- 3d2f4fd system/security: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH by Colin Cross · 12 years ago
- c35d4eb Fix the Vector erase bug by haitao fang · 12 years ago
- b666751 am e040a571: Merge "Use %zu, %td for size_t, ptrdiff_t, respectively." by Brian Carlstrom · 12 years ago
- e040a57 Merge "Use %zu, %td for size_t, ptrdiff_t, respectively." by Brian Carlstrom · 12 years ago
- 6489e02 Use %zu, %td for size_t, ptrdiff_t, respectively. by Matteo Franchin · 12 years ago
- 1254368 am d0f35a1a: Merge commit \'049462c2920b2082bde538210b1029da19b15788\' into HEAD by The Android Open Source Project · 12 years ago
- d0f35a1 Merge commit '049462c2920b2082bde538210b1029da19b15788' into HEAD by The Android Open Source Project · 12 years ago
- 82b6dc9 am c55921b0: Merge commit \'72f6fde4563f9e5f2aff8211a54342d752aa7029\' into HEAD by The Android Open Source Project · 12 years ago
- c55921b Merge commit '72f6fde4563f9e5f2aff8211a54342d752aa7029' into HEAD by The Android Open Source Project · 12 years ago
- 049462c am 8d01e624: Merge "softkeymaster: do not use GNU old-style field designators" by Nick Kralevich · 12 years ago
- 8d01e62 Merge "softkeymaster: do not use GNU old-style field designators" by Nick Kralevich · 12 years ago
- 2d73d55 softkeymaster: do not use GNU old-style field designators by synergydev · 12 years ago
- 72f6fde resolved conflicts for merge of 1a023f89 to klp-dev-plus-aosp by Kenny Root · 12 years ago
- 1a023f8 Merge "Fix some spots where targetUid was missed" by Kenny Root · 12 years ago
- fa27d5b Fix some spots where targetUid was missed by Kenny Root · 12 years ago
- f903612 am ee8068b9: Set encrypted flag when appropriate by Kenny Root · 12 years ago
- ee8068b Set encrypted flag when appropriate by Kenny Root · 12 years ago
- dc3b74f am ace0b422: Merge "Use canonical UniquePtr.h header" by Kenny Root · 12 years ago
- ace0b42 Merge "Use canonical UniquePtr.h header" by Kenny Root · 12 years ago
- 26cfc08 Use canonical UniquePtr.h header by Kenny Root · 12 years ago
- 3124312 am cabc0202: Merge changes I52418ade,Ic02102cb by Kenny Root · 12 years ago
- 6f14995 am c7fe66ea: Merge "Revert to old-style API for EC_KEY handling" by Kenny Root · 12 years ago
- cabc020 Merge changes I52418ade,Ic02102cb by Kenny Root · 12 years ago
- 70f16c1 Add argument to binder call to check key types by Kenny Root · 12 years ago
- b4d2e02 Provide fallback for keymaster implementations by Kenny Root · 12 years ago
- c7fe66e Merge "Revert to old-style API for EC_KEY handling" by Kenny Root · 12 years ago
- 77acaa0 Revert to old-style API for EC_KEY handling by Kenny Root · 12 years ago
- 541ca3e am f25805e3: am 1d486fb3: am 02d44fe7: Move key name creation to common path by Kenny Root · 12 years ago
- f25805e am 1d486fb3: am 02d44fe7: Move key name creation to common path by Kenny Root · 12 years ago
- 1d486fb am 02d44fe7: Move key name creation to common path by Kenny Root · 12 years ago
- 0c12eb3 am 86b16e8c: Move key name creation to common path by Kenny Root · 12 years ago
- 02d44fe Move key name creation to common path by Kenny Root · 12 years ago
- 86b16e8 Move key name creation to common path by Kenny Root · 12 years ago
- b6bc6ca am 47041552: Revert to old-style API for EC_KEY handling by Kenny Root · 12 years ago
- 4704155 Revert to old-style API for EC_KEY handling by Kenny Root · 12 years ago
- e6287b9 am 1b0e3933: Add argument to binder call to check key types by Kenny Root · 12 years ago
- 1b0e393 Add argument to binder call to check key types by Kenny Root · 12 years ago