Dianne Hackborn b54980d1d4 Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1

2011-11-28 16:53:00 -08:00

..

java

Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1

2011-11-28 16:53:00 -08:00

jni

Eliminate hw.keyboards system properties.

2011-11-15 18:00:10 -08:00

res

Fix issue #5588689: Black camera preview after coming back from gmail

2011-11-28 14:45:50 -08:00

tests

am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901" into ics-mr0

2011-11-28 16:02:44 -08:00