summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importcm-12.1clyde@build012016-12-162-0/+84
* Automatic translation importMichael Bestas2016-04-2017-0/+642
* Merge tag 'android-5.1.1_r37' into HEADJessica Wagantall2016-04-042-1/+8
|\
| * Trust CA certificates added for the whole OS onlyRobin Lee2016-02-262-1/+8
* | Catch corrupt cert errorEd Falk2015-09-081-11/+15
* | Merge tag 'android-5.1.0_r1' of https://android.googlesource.com/platform/pac...staging/cm-12.1stable/cm-12.1-YOG3CSteve Kondik2015-03-155-12/+12
|\|
| * am cf188a52: (-s ours) am d48b66cd: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\
| | * am d48b66cd: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |\
| * | | am a13a813b: (-s ours) am 4b7effff: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-300-0/+0
| |\| |
| | * | am 4b7effff: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-300-0/+0
| | |\ \
| * | | | am 56611958: (-s ours) am fb3b6190: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |\| | |
| | * | | am fb3b6190: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |/| | |
* | | | | Automatic translation importstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0Michael Bestas2015-02-104-0/+220
| |_|_|/ |/| | |
* | | | Import translations. DO NOT MERGEstaging/cm-12.0-cafBaligh Uddin2014-10-191-2/+2
| |_|/ |/| |
* | | Import translations. DO NOT MERGEBaligh Uddin2014-09-283-5/+5
| |/ |/|
* | Import translations. DO NOT MERGEBaligh Uddin2014-09-142-5/+5
|/
* Fix buildSungsoo Lim2014-09-111-2/+0
* am b3f3f024: am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for me...Kenny Root2014-09-111-0/+2
|\
| * am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b...Kenny Root2014-09-111-1/+5
| |\
| | * am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-devKenny Root2014-09-111-1/+5
| | |\
| | | * am 69506291: resolved conflicts for merge of 48d20b70 to klp-devKenny Root2014-09-111-1/+5
| | | |\
| | | | * resolved conflicts for merge of 48d20b70 to klp-devKenny Root2014-09-101-1/+5
| | | | |\
| | | | | * am 5aac5317: Check component class instead of actionKenny Root2014-09-101-1/+5
| | | | | |\
| | | | | | * Check component class instead of actionKenny Root2014-06-121-1/+5
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-241-7/+7
* | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-08-163-14/+14
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-153-14/+14
* | | | | | | | am 66f69041: (-s ours) am f9894e70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-08-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | am f9894e70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-08-150-0/+0
| |\| | | | |
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-152-7/+7
* | | | | | | Merge "Remove deprecated locales - DO NOT MERGE" into lmp-devBaligh Uddin2014-07-1712-690/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1912-690/+0
* | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-171-1/+1
|/ / / / / / /
* | | | | | | am c05e175e: (-s ours) am 9a7dc69c: (-s ours) am 0b4c1a08: (-s ours) am 77930...Baligh Uddin2014-07-060-0/+0
|\| | | | | |
| * | | | | | am 9a7dc69c: (-s ours) am 0b4c1a08: (-s ours) am 779301f3: (-s ours) Import t...Baligh Uddin2014-07-060-0/+0
| |\| | | | |
| | * | | | | am 0b4c1a08: (-s ours) am 779301f3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | |\| | | |
| | | * | | | am 779301f3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | | |\| | |
| | | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-07-052-2/+2
* | | | | | | am fd95f033: (-s ours) am e5e9552d: (-s ours) am dbed01b4: (-s ours) Import t...Baligh Uddin2014-07-060-0/+0
|\| | | | | |
| * | | | | | am e5e9552d: (-s ours) am dbed01b4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| |\| | | | |
| | * | | | | am dbed01b4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | |\| | | |
| | | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-056-28/+28
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-058-0/+448
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-06-2916-1/+858
* | | | | | | Merge "Block certificate installation if user restriction enabled."Julia Reynolds2014-06-171-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Block certificate installation if user restriction enabled.Julia Reynolds2014-06-121-0/+8
* | | | | | | | Check component class instead of actionKenny Root2014-05-301-1/+5
|/ / / / / / /
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-231-1/+1
* | | | | | | am e78671c5: (-s ours) am af8d8bb2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-230-0/+0
|\| | | | | |
| * | | | | | am af8d8bb2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-230-0/+0
| |\| | | | |