Dianne Hackborn ead40eaedb resolved conflicts for merge of cc20b4e3 to master ...

Change-Id: I990368443a16a0577f7a1f5623b348cca3f81ac4

2011-06-03 15:01:49 -07:00

..

java

resolved conflicts for merge of cc20b4e3 to master

2011-06-03 15:01:49 -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 cc20b4e3 to master

2011-06-03 15:01:49 -07:00

tests

Bluetooth: correcting return value from cancelDiscovery

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