Dianne Hackborn 3267d356d1 am 7e5ca578: am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 ...

* commit '7e5ca5781b406d4f862254dad1758b91ce89f896':
  Fix to not lose state when saving a deactivated fragment.

2011-06-03 18:02:10 -07:00

..

java

am 7e5ca578: am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2

2011-06-03 18:02:10 -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