Narayan Kamath 7a44d68249 Merge "Allow multiple TextToSpeech instances per calling app."

2011-11-30 02:45:22 -08:00

..

java

Merge "Allow multiple TextToSpeech instances per calling app."

2011-11-30 02:45:22 -08:00

jni

Fix compile error in android_hardware_Camera.cpp.

2011-11-30 11:07:08 +08:00

res

Display max retry lockout message on backup lock fixes 5462647

2011-11-29 20:49:08 -05:00

tests

am 4f5434f3: am e5715521: am 2d9f4620: Fix build

2011-11-28 16:59:20 -08:00