John Reck 33eabdca81 am 2f2c0e75: Merge "Fix NPE in layer destruction" ...

* commit '2f2c0e75af6c1a52e067903d0cf9aa4cddd4e37e':
  Fix NPE in layer destruction

2014-02-20 13:26:56 -08:00

..

java

am 2f2c0e75: Merge "Fix NPE in layer destruction"

2014-02-20 13:26:56 -08:00

jni

Update framework to enable Skia to run in debug mode.

2014-02-20 14:47:54 -05:00

res

Merge "Import translations. DO NOT MERGE"

2014-02-19 22:14:17 +00:00

tests

…