Brian Carlstrom eefaf27d55 Merge "KeyStore.reset changes"

2011-06-02 17:02:38 -07:00

..

java

Merge "KeyStore.reset changes"

2011-06-02 17:02:38 -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 5c2e4d20 to master

2011-06-02 14:29:13 -07:00

tests

Bluetooth: correcting return value from cancelDiscovery

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