Adam Powell a5dd05f26f am ef7c0948: Merge "Add an internal method for setting optical insets." into lmp-preview-dev ...

* commit 'ef7c0948ea1379ee9f3f5f40267ca2cf5e76a36b':
  Add an internal method for setting optical insets.

2014-06-03 17:15:34 +00:00

..

java

am ef7c0948: Merge "Add an internal method for setting optical insets." into lmp-preview-dev

2014-06-03 17:15:34 +00:00

jni

am 8e3605e4: Merge "Check for NULL on TypefaceImpl unref" into lmp-preview-dev

2014-06-03 17:15:21 +00:00

res

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

tests

Merge "Reenable DynamicRotationList for language-switching-aware IMEs"

2014-06-03 00:51:32 +00:00