summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...staging/cm-12.0-cafstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0The Android Automerger2014-10-210-0/+0
|\
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-210-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-190-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-160-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-150-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-140-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-130-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-120-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-090-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-080-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-070-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-060-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-050-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-10-010-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-09-300-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-09-290-0/+0
|/|
| * merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1...The Android Automerger2014-09-280-0/+0
|/|
| * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-250-0/+0
| |\
| | * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-240-0/+0
| |/|
| | * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-230-0/+0
| |/|
| | * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-220-0/+0
| |/|
| | * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-210-0/+0
| |/|
| | * merge in lmp-release history after reset to 4d7a568891ebff7bfb8cad4084b7368d9...The Android Automerger2014-09-200-0/+0
| | |\
| | | * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-200-0/+0
| | |/| | |/|/
| | * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-180-0/+0
| |/|
| | * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-170-0/+0
| |/|
| | * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-160-0/+0
| |/|
| | * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-150-0/+0
| |/|
| | * merge in lmp-release history after reset to 31e27468b6d822adbd2aec9219a68c206...The Android Automerger2014-09-140-0/+0
| |/|
| | * merge in lmp-release history after reset to b4918b9a2794a2afae08d5f8cddad6390...The Android Automerger2014-09-130-0/+0
| | |\ | | |/ | |/|
* | | Merge "Delete user's keys only after keystore reset" into lmp-devRobin Lee2014-09-261-146/+97
|\ \ \
| * | | Delete user's keys only after keystore resetRobin Lee2014-09-261-146/+97
| |/ /
* / / Fallback to software keystore on import_key failureKenny Root2014-09-251-5/+8
|/ /
* / isEmpty checks all files like resetKenny Root2014-09-111-10/+5
|/
* Build keystore in 32 bit on platforms that require it.Shawn Willden2014-08-292-0/+15
* APIs for syncing password between profilesRobin Lee2014-08-293-17/+201
* Correct double-convert from uid to useridRobin Lee2014-08-121-4/+2
* Merge "keystore: allow system to clear keys even while encrypted" into lmp-devKenny Root2014-07-311-7/+11
|\
| * keystore: allow system to clear keys even while encryptedKenny Root2014-07-311-7/+11
* | keystore: fully reset user keystore on requestKenny Root2014-07-311-13/+1
|/
* am 00b27fc4: am 0387a7fd: Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich2014-06-302-26/+122
|\
| * am 0387a7fd: Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich2014-06-302-26/+122
| |\
| | * Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich2014-06-262-26/+122
| | |\
| | | * Add calls for SELinux MAC checks in keystore.Riley Spahn2014-06-302-26/+122
| | |/
* | | am 1bed3f00: am 9421618b: Merge "Revert "Add calls for SELinux MAC checks in ...Nick Kralevich2014-06-302-112/+28
|\| |
| * | am 9421618b: Merge "Revert "Add calls for SELinux MAC checks in keystore.""Nick Kralevich2014-06-302-112/+28
| |\|
| | * Merge "Revert "Add calls for SELinux MAC checks in keystore.""Nick Kralevich2014-06-272-112/+28
| | |\
| | | * Revert "Add calls for SELinux MAC checks in keystore."Nick Kralevich2014-06-302-112/+28
* | | | am e24fbbae: am bbf064bb: Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich2014-06-262-28/+112
|\| | |
| * | | am bbf064bb: Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich2014-06-262-28/+112
| |\| |