Charles Chen 629d03f122 am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo ...

Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp

* commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
  Fix for bug 2548048 - it was impossible for applications to discover

2010-03-29 18:41:48 -07:00

..

config

…

java

am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo

2010-03-29 18:41:48 -07:00

jni

Add some comments for zoom methods.

2010-03-29 16:21:12 +08:00

res

Merge "Fix possible security issue. Bug #2553187" into froyo

2010-03-29 16:31:14 -07:00

tests

relocate android.util.base64.* -> android.util.*

2010-03-29 13:46:47 -07:00