Zhijun He 10586ad2a6 am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" ...

* commit '4f840dd16db41a2d4442667193d57260f84af04a':
  Release locked buffer when it fails to acquire graphics buffer

2014-01-31 15:12:38 +00:00

..

java/android

Fix invocation of notification callback in case the callback is modified

2014-01-27 16:30:09 -08:00

jni

am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"

2014-01-31 15:12:38 +00:00

lib

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

mca

Resolved conflicts for merge of 28c6ec02 to master

2014-01-16 15:49:59 +00:00

tests

Remove calls to deprecated SkBitmap::setIsOpaque()

2014-01-15 11:37:04 -05:00