summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Keymaster: Support for 64bit userspace and 32bit TZ"staging/cm-12.0-cafLinux Build Service Account2014-10-223-20/+28
|\
| * Keymaster: Support for 64bit userspace and 32bit TZJyoti Wadhwani2014-10-213-20/+28
|/
* am 2d8aa1e3: merge in master-release history after reset to f4191b59196237680...The Android Automerger2014-06-060-0/+0
|\
| * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-220-0/+0
| |\
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-220-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-210-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-200-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-190-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-180-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-170-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-150-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-140-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-130-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-120-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-110-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-100-0/+0
| |/|
| | * merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62...The Android Automerger2014-05-080-0/+0
| |/|
| | * Set correct module version for qcom keystorePaul Lawrence2014-05-072-3/+3
* | | keymaster: fix QSEEComAPI lookup pathMekala Natarajan2014-06-041-1/+1
* | | keymaster: Build keymaster for msm8084Naveen Ramaraj2014-06-033-3/+14
|/ /
* / Set correct module version for qcom keystorePaul Lawrence2014-05-062-3/+3
|/
* Add flag indicating that this impl doesn't require /data.Geremy Condra2014-04-171-1/+1
* am 70d36107: am 711560b6: Merge "Log message spelling correction."Kenny Root2014-01-141-1/+1
|\
| * am 711560b6: Merge "Log message spelling correction."Kenny Root2014-01-141-1/+1
| |\
| | * Merge "Log message spelling correction."Kenny Root2014-01-141-1/+1
| | |\
| | | * Log message spelling correction.Ian Rogers2014-01-131-1/+1
| | |/
* | | am 162723c0: am 060bd97e: Merge commit \'eab8a2ac417ba93bdfb09ddcb6095580a0ce...The Android Open Source Project2013-12-060-0/+0
|\| |
| * | am 060bd97e: Merge commit \'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4\' into HEADThe Android Open Source Project2013-12-050-0/+0
| |\|
| | * Merge commit 'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4' into HEADThe Android Open Source Project2013-12-050-0/+0
| | |\
* | | | am 350fbb78: am 099a9d06: Merge commit \'7d563651aa956c0f9831b7b64be35c2ec790...The Android Open Source Project2013-11-220-0/+0
|\| | |
| * | | am 099a9d06: Merge commit \'7d563651aa956c0f9831b7b64be35c2ec790bdec\' into HEADThe Android Open Source Project2013-11-220-0/+0
| |\| | | | |/ | |/|
| | * Merge commit '7d563651aa956c0f9831b7b64be35c2ec790bdec' into HEADThe Android Open Source Project2013-11-222-3/+53
| | |\
* | | \ Merge "keymaster: rename ion_allocation_data.heap_mask to heap_id_mask"Rom Lemarchand2013-11-071-1/+1
|\ \ \ \
| * | | | keymaster: rename ion_allocation_data.heap_mask to heap_id_maskRom Lemarchand2013-10-231-1/+1
* | | | | am eab8a2ac: am f740c98b: Merge "do not use GNU old-style field designators"Nick Kralevich2013-11-061-11/+11
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | / am f740c98b: Merge "do not use GNU old-style field designators"Nick Kralevich2013-11-061-11/+11
| |\| | | | |/ | |/|
| | * Merge "do not use GNU old-style field designators"Nick Kralevich2013-11-071-11/+11
| | |\
| | | * do not use GNU old-style field designatorssynergy dev2013-11-061-11/+11
| | |/
* | | am 7d563651: am e35dafa8: Merge "Use canonical UniquePtr.h header"Kenny Root2013-09-180-0/+0
|\| |
| * | am e35dafa8: Merge "Use canonical UniquePtr.h header"Kenny Root2013-09-181-1/+2
| |\|
| | * Merge "Use canonical UniquePtr.h header"Kenny Root2013-09-111-1/+2
| | |\
| | | * Use canonical UniquePtr.h headerKenny Root2013-09-111-1/+2
| | |/
* | / Use canonical UniquePtr.h headerKenny Root2013-09-111-1/+2
|/ /
* | keymaster: Enable compilation for msm8226 based platformsAjay Dudani2013-08-201-1/+1
* | keymaster: Add support for enabling CE clksAjay Dudani2013-06-131-0/+50
* | keymaster: Add msm8974 archtecture and use TARGET_BOARD_PLATFORMSungmin Choi2013-05-241-3/+3
|/
* keymaster: Add support for larger key sizeAjay Dudani2013-05-172-3/+3
* keymaster: Fixup ion allocation request to match kernel ion apiAjay Dudani2013-04-221-4/+4
* keymaster: Add keymaster implementationAjay Dudani2012-11-214-0/+1296
* Initial empty repositorycm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingChad Jones2012-09-300-0/+0