| commit | 55c764ae6e75f500be7895cb6667aa6433b5340e | [log] [tgz] |
|---|---|---|
| author | David Ng <dave@codeaurora.org> | Wed Dec 09 17:46:07 2015 -0800 |
| committer | David Ng <dave@codeaurora.org> | Wed Dec 09 17:46:07 2015 -0800 |
| tree | 6c0cc09fad685d13b9e7a797842bc6a143626560 | |
| parent | 95e72d3a791320aeef437eaca932cadf2c129d96 [diff] | |
| parent | 86542797761632890092ef89b7fb58c2c2cdfc11 [diff] |
Merge tag 'android-6.0.1_r3' into 601r3 Android 6.0.1 release 3 * tag 'android-6.0.1_r3': Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE Accept variation selector in emoji sequences - DO NOT MERGE Complete half-done cherry-picking of Android.mk. DO NOT MERGE Explicitly set utf-8 encoding for hyb file verification Binary format for hyphenation patterns Change-Id: Ib9845719d41e0a0f6290ee72ac17cab5c886be59