Makoto Onuki 22963b8937 Merge \"Handle locale change and pacakge change in different way\" into nyc-mr1-dev ...

am: 83fa7a8255

Change-Id: I4988ff6c77f70211336e21729f0f6cd69beefc7d

2016-07-15 00:49:28 +00:00

..

java

Merge \"Handle locale change and pacakge change in different way\" into nyc-mr1-dev

2016-07-15 00:49:28 +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