tree e6add1358ba52db2784f488cc23835980be2cf26
parent 4fc90de51b58771c079f2e0d51d15abd28a5015b
author John Reck <jreck@google.com> 1405618222 -0700
committer John Reck <jreck@google.com> 1405618584 +0000

Revert "Separate Canvas JNI code from the implementation."

This reverts commit e28a5afee885cd69a5be5809f88116b601cb1a72.

 Appears to cause memory corruption and random appearances of
 chinese

 Bug: 16343240
 Bug: 16336642

Change-Id: Ife169181f40adff4b12948ed5f9d3a88dcec935b