Jason Sams eb5b73504d Merge commit 'bdeec118' into manualmerge ...

Conflicts:
	libs/rs/rsThreadIO.h

Change-Id: I7f448996a86f41188b47ec3dc353c364692e8bf2

2012-02-07 16:40:51 -08:00

..

java/android

am e05bc81c: Merge "We should not throw for non-fatal errors."

2012-02-03 15:37:52 -08:00

jni

Merge commit 'bdeec118' into manualmerge

2012-02-07 16:40:51 -08:00

tests/graphicstests

Expose an API to get a bitmap's size in bytes.

2011-02-16 17:50:43 -08:00