Tom Hudson 1de39f1563 Merge "Revert "Merge six commits from master-skia to master""

2015-10-28 20:48:05 +00:00

..

java

Merge "Free DisplayListData for Views with GONE parents"

2015-10-28 19:20:49 +00:00

jni

Revert "Merge six commits from master-skia to master"

2015-10-28 20:35:36 +00:00

res

Merge "Import translations. DO NOT MERGE"

2015-10-28 19:14:30 +00:00

tests

Merge "Enable default system IMEs for system user"

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