summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/ha...HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0Steve Kondik2016-03-110-0/+0
|\
| * Remove legacy keymaster support for msm8226Uday Kishore Pasupuleti2015-09-161-1/+1
* | keymaster: add msm8909 into support listEdward Wang2016-02-231-1/+1
* | Disable ION_HEAP_MASK_COMPATIBILITY_WA on Sony 3.10 KernelAdam Farden2016-01-201-0/+2
* | keymaster: Allow 8952 to buildEthan Chen2015-12-241-1/+1
* | keymaster: add TARGET_PROVIDES_KEYMASTERKeith Mok2015-12-041-0/+2
* | keymaster: Featureize support for waiting on QSEE to startmyfluxi2015-11-042-0/+7
* | Keymaster: Check if keymaster TZ app is loadedJyoti Wadhwani2015-10-302-1/+27
* | keymaster: Add kernel dependencySteve Kondik2015-10-151-1/+3
* | keymaster: Set HEAP_MASK_COMPATIBILITY by platform for QCOM_HARDWAREEthan Chen2015-10-141-0/+6
* | keymaster: Fix build for devices that don't define BOARD_USES_QCOM_HARDWAREdhacker292015-10-141-1/+1
* | keymaster: restore $(TARGET_BOARD_PLATFORM).repo Shareef Ali2015-10-141-1/+1
* | Keymaster: Support for 64bit userspace and 32bit TZJyoti Wadhwani2015-10-143-21/+29
|/
* am 56d7d4bc: am d2bdc571: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-03-251-2/+1
|\
| * am d2bdc571: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-03-251-2/+1
| |\
| | * Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-03-251-2/+1
| | |\
| | | * Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-2/+1
* | | | am fb378aec: am 26391c90: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-260-0/+0
|\| | |
| * | | am 26391c90: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-260-0/+0
| |\| |
| | * | Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-261-9/+9
| | |\ \ | | | |/ | | |/|
| | | * Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-241-9/+9
| | |/
* | | am b00de244: Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-260-0/+0
|\| |
| * | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-251-9/+9
| |/
* / Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-251-9/+9
|/
* 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
| |\|