Jeff Brown c3eea84a0b Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""

2015-03-12 21:25:40 +00:00

..

java

Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""

2015-03-12 21:25:40 +00:00

jni

Merge "Make Bitmap_createFromParcel check the color count."

2015-03-12 12:24:11 +00:00

res

am 276d1bc9: am a98c21a6: Make circular mask thickness configurable

2015-03-12 20:31:52 +00:00

tests

Fix handling of LOCAL_JACK_ENABLED

2015-02-23 17:38:58 +01:00