Romain Guy ab4835ee0d am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE. ...

Merge commit '00b17659bb4b2774580eea523c5f23b588105ab6' into eclair-plus-aosp

* commit '00b17659bb4b2774580eea523c5f23b588105ab6':
  Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.

2010-02-17 21:22:52 -08:00

..

config

…

java

am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.

2010-02-17 21:22:52 -08:00

jni

am a66baccc: Merge "Do not merge" into eclair

2010-01-20 18:35:24 -08:00

res

Fix issue: 2413494: Add TTY support.

2010-02-10 11:23:04 -08:00