summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r24' into HEADstable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2KJessica Wagantall2016-04-051-0/+3
|\
| * merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-220-0/+0
| |\
| | * merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-180-0/+0
| | |\ | | |/ | |/|
| * | Add error logging on invalid cmapRaph Levien2016-03-011-0/+3
| |/
* | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...staging/cm-13.0+r22Steve Kondik2016-03-113-16/+53
|\ \ | |/
| * Reject fonts with invalid ranges in cmap am: ca8ac8acda am: 3034e8b4ab am: a3...Raph Levien2016-01-152-16/+27
| |\
| | * Reject fonts with invalid ranges in cmap am: ca8ac8acda am: 3034e8b4ab am: a3...Raph Levien2016-01-152-16/+27
| | |\
| | | * Reject fonts with invalid ranges in cmap am: ca8ac8acda am: 3034e8b4ab am: a3...Raph Levien2016-01-152-16/+27
| | | |\
| | | | * Reject fonts with invalid ranges in cmap am: ca8ac8acda am: 3034e8b4abRaph Levien2016-01-152-16/+27
| | | | |\
| | | | | * Reject fonts with invalid ranges in cmap am: ca8ac8acdaRaph Levien2016-01-152-16/+27
| | | | | |\
| | | | | | * Reject fonts with invalid ranges in cmapRaph Levien2016-01-152-16/+27
| | | | | | |\
| | | | | | | * Reject fonts with invalid ranges in cmapRaph Levien2016-01-072-16/+27
| * | | | | | | Tailor grapheme boundaries so sequence emoji are one grapheme - DO NOT MERGERaph Levien2016-01-131-0/+26
| |/ / / / / /
| * | | | | | Avoid integer overflows in parsing fonts am: 6299a6ba13 am: 998293f985 am: ff...Raph Levien2015-12-081-3/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Avoid integer overflows in parsing fonts am: 6299a6ba13 am: 998293f985 am: ff...Raph Levien2015-12-081-3/+6
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Avoid integer overflows in parsing fonts am: 6299a6ba13 am: 998293f985Raph Levien2015-12-081-3/+6
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Avoid integer overflows in parsing fonts am: 6299a6ba13Raph Levien2015-12-081-3/+6
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Avoid integer overflows in parsing fontsRaph Levien2015-12-081-3/+6
| | | | | |\ \ | | | | | | |/
| | | | | | * Avoid integer overflows in parsing fontsRaph Levien2015-12-071-3/+6
| * | | | | | Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGERaph Levien2015-11-031-2/+31
| * | | | | | Accept variation selector in emoji sequences - DO NOT MERGERaph Levien2015-10-291-2/+8
* | | | | | | Merge tag 'android-6.0.1_r13' into 13.0Jessica Wagantall2016-02-021-3/+6
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ merge in mnc-mr1-release history after reset to mnc-dr-devThe Android Automerger2015-12-170-0/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge tag 'android-6.0.1_r10' into HEADJessica Wagantall2016-01-050-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | merge in mnc-mr1-release history after reset to mnc-dr-devThe Android Automerger2015-12-150-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Avoid integer overflows in parsing fontsRaph Levien2015-12-111-3/+6
| |/ / / / / / /
* | | | | | | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/fra...Steve Kondik2015-12-089-118/+1075
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGERaph Levien2015-11-031-2/+31
| * | | | | | | Accept variation selector in emoji sequences - DO NOT MERGERaph Levien2015-10-301-2/+8
| |/ / / / / /
| * | | | | | Complete half-done cherry-picking of Android.mk. DO NOT MERGERoozbeh Pournader2015-10-151-5/+9
| * | | | | | Explicitly set utf-8 encoding for hyb file verificationRaph Levien2015-10-141-1/+1
| * | | | | | Binary format for hyphenation patternsRaph Levien2015-10-147-109/+1027
| |/ / / / /
* | | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-050-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-300-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-220-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-210-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-160-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-150-0/+0
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-110-0/+0
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | |\ \ \ \ \
* | | | | | | | \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-150-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-130-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | |/| | | | | | |
| | | | | | * | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-010-0/+0
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | |
| | | | | | | * | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-270-0/+0
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-250-0/+0
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | |/ / / / /
| | | | | | | | | * | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-160-0/+0
| | | | | | | | | |\ \ \ \ \