Geremy Condra 8b73fc1ad3 am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev ...

* commit '2b4bc305a2305d1dda66e054d228b4708575ff8d':
  DO NOT MERGE Control access to tts objects

2012-11-08 14:26:39 -08:00

..

java

am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev

2012-11-08 14:26:39 -08:00

jni

am f4afc401: Merge "framework: fix bug for uninitialized variable"

2012-09-14 12:15:03 -07:00

res

am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev

2012-11-02 14:22:31 -07:00

tests

am a950daf5: Merge changes Ieb566a2a,I953057cd

2012-08-16 16:33:40 -07:00