Jeff Brown 7218d830e2 resolved conflicts for merge of ca2b552d to master ...

Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b

2011-06-03 15:50:27 -07:00

..

java

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

jni

Merge "Take advantage of EGL_BUFFER_PRESERVED on IMG."

2011-06-02 14:49:28 -07:00

res

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

tests

Bluetooth: correcting return value from cancelDiscovery

2011-06-02 10:30:49 -07:00