Dianne Hackborn 678d344bcb resolved conflicts for merge of b9e2f68b to master ...

Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142

2011-06-03 14:15:10 -07:00

..

java

resolved conflicts for merge of b9e2f68b to master

2011-06-03 14:15:10 -07:00

jni

Merge "Take advantage of EGL_BUFFER_PRESERVED on IMG."

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

res

am d19fbe34: am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2

2011-06-03 14:03:20 -07:00

tests

Bluetooth: correcting return value from cancelDiscovery

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