summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importcm-12.1clyde@build012016-12-163-0/+53
* Automatic translation importMichael Bestas2016-04-2017-0/+370
* Revert "KeyChain: Fix certificate dialog needs twice Cancel to disappear."stable/cm-12.1-YOG3CJorge Ruesga2015-04-071-0/+1
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1Ricardo Cerqueira2015-03-105-6/+6
|\
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-170-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-11-080-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-11-060-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-11-050-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-11-040-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-11-030-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-11-020-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-11-010-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-300-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-290-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-280-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-270-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-260-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-250-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-230-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-220-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-210-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-200-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-190-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 1f00eaf6936421542f139f1066bd4...The Android Automerger2014-10-180-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-160-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-150-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-140-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-130-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-120-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-110-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-090-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-080-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-070-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-060-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-050-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-040-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-020-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 0b470dd9758d09d8adefc10a55b2a...The Android Automerger2014-10-010-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-300-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-290-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-280-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-270-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-250-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-240-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-230-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-230-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-220-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-220-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to e2ebab448a5c4db2a463f20222f23...The Android Automerger2014-09-220-0/+0
| | | | |/|
| * | | | | Call local finish(String) on cancelKenny Root2014-11-141-1/+1
| |/ / / /