Romain Guy 81d7848f17 Merge "Properly refcount SurfaceTexture in the JNI layer."

2011-06-15 16:49:57 -07:00

..

java

Merge "Properly refcount SurfaceTexture in the JNI layer."

2011-06-15 16:49:57 -07:00

jni

Properly refcount SurfaceTexture in the JNI layer.

2011-06-15 16:14:26 -07:00

res

am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp

2011-06-15 13:44:56 -07:00

tests

Merge "Refactor Bluetooth Profile."

2011-06-14 21:33:03 -07:00