Tom Hudson 37028137f2 Merge "Merge six commits from master-skia to master"

2015-10-28 17:56:10 +00:00

..

java

Merge "Fix javadoc"

2015-10-28 17:20:03 +00:00

jni

Merge six commits from master-skia to master

2015-10-28 13:41:38 -04:00

res

Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e am: c45009906a

2015-10-28 17:48:28 +00:00

tests

Merge "Enable default system IMEs for system user"

2015-10-28 17:05:58 +00:00