Jeff Brown 371790b774 resolved conflicts for merge of 955e8d79 to master ...

Change-Id: I90b0d523053d173b7df60ebc975de65ab387ff18

2011-06-03 17:24:05 -07:00

..

java

resolved conflicts for merge of 955e8d79 to master

2011-06-03 17:24:05 -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