summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1IMichael Bestas2015-02-104-0/+108
* KeyChain: Fix certificate dialog needs twice Cancel to disappear.staging/cm-12.0-cafkaiyiz2014-11-041-1/+0
* merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-210-0/+0
|\
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-210-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-190-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-160-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-150-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-140-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-130-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-120-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-090-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-080-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-070-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-060-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-050-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-10-010-0/+0
|/|
| * merge in lmp-release history after reset to 0b1acbb5bf0301eb2299a20a72c64b01b...The Android Automerger2014-09-300-0/+0
|/|
| * merge in lmp-release history after reset to 796e3c3fd12b9e8675a98d698affc167f...The Android Automerger2014-09-290-0/+0
| |\
| | * merge in lmp-release history after reset to 796e3c3fd12b9e8675a98d698affc167f...The Android Automerger2014-09-280-0/+0
| |/|
| | * merge in lmp-release history after reset to 796e3c3fd12b9e8675a98d698affc167f...The Android Automerger2014-09-250-0/+0
| |/|
| | * merge in lmp-release history after reset to 796e3c3fd12b9e8675a98d698affc167f...The Android Automerger2014-09-240-0/+0
| |/|
| | * merge in lmp-release history after reset to 796e3c3fd12b9e8675a98d698affc167f...The Android Automerger2014-09-230-0/+0
| |/|
| | * merge in lmp-release history after reset to 796e3c3fd12b9e8675a98d698affc167f...The Android Automerger2014-09-220-0/+0
| |/|
| | * merge in lmp-release history after reset to 796e3c3fd12b9e8675a98d698affc167f...The Android Automerger2014-09-210-0/+0
| |/|
| | * merge in lmp-release history after reset to 0e0c07c41eba3787adcb9a820eeae0d12...The Android Automerger2014-09-200-0/+0
| | |\
| | | * merge in lmp-release history after reset to 796e3c3fd12b9e8675a98d698affc167f...The Android Automerger2014-09-200-0/+0
| | |/| | |/|/
| | * merge in lmp-release history after reset to 796e3c3fd12b9e8675a98d698affc167f...The Android Automerger2014-09-180-0/+0
| |/|
| | * merge in lmp-release history after reset to 796e3c3fd12b9e8675a98d698affc167f...The Android Automerger2014-09-170-0/+0
| |/|
| | * merge in lmp-release history after reset to d300fc59cf229dd634f317c77af12000d...The Android Automerger2014-09-160-0/+0
| | |\
| | | * merge in lmp-release history after reset to d300fc59cf229dd634f317c77af12000d...The Android Automerger2014-09-150-0/+0
| | |/|
| | | * merge in lmp-release history after reset to d300fc59cf229dd634f317c77af12000d...The Android Automerger2014-09-140-0/+0
| | |/|
| | | * merge in lmp-release history after reset to 3d25b3144669ceb787dfd00f1e312516c...The Android Automerger2014-09-130-0/+0
| | | |\ | | | |/ | | |/|
* | / | Import translations. DO NOT MERGEBaligh Uddin2014-09-291-2/+2
|/ / /
* / / Import translations. DO NOT MERGEBaligh Uddin2014-09-142-2/+2
|/ /
* / Implement IKeychainService.installkeyPair.Bernhard Bauer2014-09-111-0/+20
|/
* Implement CACert retrieval in KeyChainServiceZoltan Szatmary-Ban2014-09-081-0/+83
* Tag keystore aliases with user-specific SYSTEM_UIDRobin Lee2014-09-021-1/+4
* Import translations. DO NOT MERGEBaligh Uddin2014-08-241-1/+1
* Import translations. DO NOT MERGEBaligh Uddin2014-08-151-1/+1
* Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-devZoltan Szatmary-Ban2014-08-151-82/+0
|\
| * Revert "Update Trusted Credentials screen in settings"Zoltan Szatmary-Ban2014-08-151-82/+0
* | Merge "Update Trusted Credentials screen in settings" into lmp-devZoltan Szatmary-Ban2014-08-151-0/+82
|\|
| * Update Trusted Credentials screen in settingsZoltan Szatmary-Ban2014-07-291-0/+82
* | Make sure a "Cancel" is honoredKenny Root2014-07-311-3/+8
|/
* Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1911-308/+0
* Merge "Apply user restriction to KeyChainService."Julia Reynolds2014-07-081-0/+10
|\
| * Apply user restriction to KeyChainService.Julia Reynolds2014-06-301-0/+10
* | am 9afea03f: (-s ours) am 3f1de820: (-s ours) am 3f4060a0: (-s ours) am 6072a...Baligh Uddin2014-07-060-0/+0
|\ \
| * \ am 3f1de820: (-s ours) am 3f4060a0: (-s ours) am 6072a256: (-s ours) Import t...Baligh Uddin2014-07-060-0/+0
| |\ \
| | * \ am 3f4060a0: (-s ours) am 6072a256: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | |\ \