Andrew Sapperstein 6b77f8126f resolve merge conflicts of bc2ba56 to master ...

Change-Id: Ie7c1ba0704e392efc6122a8addb6c082680a7c2e

2016-07-03 15:36:00 -04:00

..

java

Merge \\"Clarify documentation of Display#getSize()\\" into nyc-mr1-dev am: 5552dc341f

2016-07-01 23:58:51 +00:00

jni

Remove isAvailable() from DisplayListCanvas.

2016-06-29 08:25:06 -04:00

res

resolve merge conflicts of bc2ba56 to master

2016-07-03 15:36:00 -04:00

tests

Merge "Refactor WordIterator to avoid copying to internal buffers"

2016-07-01 00:03:59 +00:00