Jeff Sharkey 6dbf6fda8c Merge "resolve merge conflicts of 07c6628d68 to master."

2015-10-30 22:45:53 +00:00

..

java

Merge "resolve merge conflicts of 07c6628d68 to master."

2015-10-30 22:45:53 +00:00

jni

Merge six commits from master-skia to master

2015-10-29 12:29:03 -04:00

res

Merge "Add window setDecorView API."

2015-10-30 20:55:35 +00:00

tests

Merge "Enable default system IMEs for system user"

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