Raph Levien 3fabee6f41 Merge \"Don\'t count zero width space in hasGlyph layout\" into nyc-mr1-dev ...

am: f9c8893d1b

Change-Id: Ib84918cf6e12392fc58500d47feeb38ab28b7d43

2016-07-14 22:37:57 +00:00

..

java

Merge \"Treat U+2695, U+2640, U+2642 as emoji characters.\" into nyc-mr1-dev

2016-07-14 22:37:53 +00:00

jni

Merge \"Don\'t count zero width space in hasGlyph layout\" into nyc-mr1-dev

2016-07-14 22:37:57 +00:00

res

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

2016-07-14 20:27:17 +00:00

tests

Merge \"Treat U+2695, U+2640, U+2642 as emoji characters.\" into nyc-mr1-dev

2016-07-14 22:37:53 +00:00