Jorim Jaggi 9b23400b05 Merge "Fixes for resize thread" into nyc-dev am: 13219992a0 am: 47606dc20f ...

am: b3150d580e

* commit 'b3150d580e869fe85e3aec1b6417a9161acc7400':
  Fixes for resize thread

Change-Id: I6c9d9151edd94b18792875cd25f70f816053e326

2016-04-20 00:18:57 +00:00

..

java

Merge "Fixes for resize thread" into nyc-dev am: 13219992a0 am: 47606dc20f

2016-04-20 00:18:57 +00:00

jni

Merge "Force windows to be scalable during pinned animation." into nyc-dev am: 4e9a9df am: 1b72363

2016-04-19 22:28:20 +00:00

res

Import translations. DO NOT MERGE

2016-04-18 22:03:13 -07:00

tests

Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev am: 7ecd767 am: 3de469a

2016-04-19 18:44:59 +00:00